Submitted By: DJ Lucas Date: 2025-05-31 Initial Package Version: 1.3.6 Upstream Status: Applied Origin: https://github.com/cyrusimap/cyrus-sasl/pull/873 Description: Fixes build with GCC-15. From c3ccead6ee3773f624708ca22be41292cd5ce557 Mon Sep 17 00:00:00 2001 From: "mark.yang" Date: Wed, 9 Apr 2025 11:46:36 +0900 Subject: [PATCH] configure prototypes * Set to use function prototypes for ANSI_C If PROTOTYPES is set in md5global.h, it uses PROTO_LIST(list) list instead of PROTO_LIST(list) () to provide parameterized prototyping. Therefore, at the configure.ac stage, when using ANSI_C, PROTOTYPES should be defined. * to fix the build error with gcc-15 Even though I added this configuration to fix the error, the error shown in the following patch still occurs. ../../git/lib/md5.c:139:8: error: too many arguments to function 'MD5_memcpy'; expected 0, have 3 139 | MD5_memcpy | ^~~~~~~~~~ 140 | ((POINTER)&context->buffer[index], (POINTER)input, partLen); MD5Transform | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../../git/lib/md5.c:62:13: note: declared here 62 | static void MD5_memcpy PROTO_LIST ((POINTER, POINTER, unsigned int)); | ^~~~~~~~~~ Signed-off-by: mark.yang --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 2a0cf878..657e178b 100644 --- a/configure.ac +++ b/configure.ac @@ -88,6 +88,7 @@ AC_ARG_ENABLE(obsolete_digest_attr, enable_obsolete_digest_attr=yes) AC_PROG_CC +AC_C_PROTOTYPES AX_PROG_CC_FOR_BUILD AC_PROG_CPP AC_PROG_AWK From 79bce416883cab6dc45151575f2a66dc181c67e4 Mon Sep 17 00:00:00 2001 From: "mark.yang" Date: Wed, 9 Apr 2025 15:42:13 +0900 Subject: [PATCH] Fix incompatible-pointer-types error with gcc-15 * Fix incompatible-pointer-types error with gcc-15 ../../git/saslauthd/md5.c:400:14: error: passing argument 1 of 'MD5_memset' from incompatible pointer type [-Wincompatible-pointer-types] 400 | MD5_memset(&k_ipad, 0, sizeof(k_ipad)); | ^~~~~~~ | | | unsigned char (*)[65] ../../git/saslauthd/md5.c:335:9: note: expected 'POINTER' {aka 'unsigned char *'} but argument is of type 'unsigned char (*)[65]' 335 | POINTER output; | ^~~~~~ In file included from ../../git/saslauthd/md5.c:29: ../include/md5global.h:16:24: note: 'POINTER' declared here 16 | typedef unsigned char *POINTER; | ^~~~~~~ ../../git/saslauthd/md5.c:401:14: error: passing argument 1 of 'MD5_memset' from incompatible pointer type [-Wincompatible-pointer-types] 401 | MD5_memset(&k_opad, 0, sizeof(k_opad)); | ^~~~~~~ | | | unsigned char (*)[65] ../../git/saslauthd/md5.c:335:9: note: expected 'POINTER' {aka 'unsigned char *'} but argument is of type 'unsigned char (*)[65]' 335 | POINTER output; | ^~~~~~ ../include/md5global.h:16:24: note: 'POINTER' declared here 16 | typedef unsigned char *POINTER; | ^~~~~~~ ../../git/saslauthd/md5.c:402:14: error: passing argument 1 of 'MD5_memset' from incompatible pointer type [-Wincompatible-pointer-types] 402 | MD5_memset(&tk, 0, sizeof(tk)); | ^~~ | | | unsigned char (*)[16] ../../git/saslauthd/md5.c:335:9: note: expected 'POINTER' {aka 'unsigned char *'} but argument is of type 'unsigned char (*)[16]' 335 | POINTER output; | ^~~~~~ ../include/md5global.h:16:24: note: 'POINTER' declared here 16 | typedef unsigned char *POINTER; | ^~~~~~~ ../../git/saslauthd/md5.c: In function '_saslauthd_hmac_md5_precalc': ../../git/saslauthd/md5.c:427:14: error: passing argument 1 of 'MD5_memset' from incompatible pointer type [-Wincompatible-pointer-types] 427 | MD5_memset(&hmac, 0, sizeof(hmac)); | ^~~~~ | | | HMAC_MD5_CTX * {aka struct HMAC_MD5_CTX_s *} ../../git/saslauthd/md5.c:335:9: note: expected 'POINTER' {aka 'unsigned char *'} but argument is of type 'HMAC_MD5_CTX *' {aka 'struct HMAC_MD5_CTX_s *'} 335 | POINTER output; | ^~~~~~ ../include/md5global.h:16:24: note: 'POINTER' declared here 16 | typedef unsigned char *POINTER; | ^~~~~~~ ../../git/saslauthd/md5.c: In function '_saslauthd_hmac_md5_import': ../../git/saslauthd/md5.c:435:14: error: passing argument 1 of 'MD5_memset' from incompatible pointer type [-Wincompatible-pointer-types] 435 | MD5_memset(hmac, 0, sizeof(HMAC_MD5_CTX)); | ^~~~ | | | HMAC_MD5_CTX * {aka struct HMAC_MD5_CTX_s *} ../../git/saslauthd/md5.c:335:9: note: expected 'POINTER' {aka 'unsigned char *'} but argument is of type 'HMAC_MD5_CTX *' {aka 'struct HMAC_MD5_CTX_s *'} 335 | POINTER output; | ^~~~~~ ../include/md5global.h:16:24: note: 'POINTER' declared here 16 | typedef unsigned char *POINTER; | ^~~~~~~ ../../git/saslauthd/md5.c: In function '_saslauthd_hmac_md5': ../../git/saslauthd/md5.c:455:6: warning: old-style function definition [-Wold-style-definition] 455 | void _saslauthd_hmac_md5(text, text_len, key, key_len, digest) | ^~~~~~~~~~~~~~~~~~~ ../../git/saslauthd/md5.c:499:23: warning: passing argument 2 of 'MD5_memcpy' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] 499 | MD5_memcpy( k_ipad, key, key_len); | ^~~ ../../git/saslauthd/md5.c:322:9: note: expected 'POINTER' {aka 'unsigned char *'} but argument is of type 'const unsigned char *' 322 | POINTER input; | ^~~~~ ../../git/saslauthd/md5.c:500:23: warning: passing argument 2 of 'MD5_memcpy' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] 500 | MD5_memcpy( k_opad, key, key_len); | ^~~ ../../git/saslauthd/md5.c:322:9: note: expected 'POINTER' {aka 'unsigned char *'} but argument is of type 'const unsigned char *' 322 | POINTER input; | ^~~~~ Signed-off-by: mark.yang --- saslauthd/md5.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/saslauthd/md5.c b/saslauthd/md5.c index d38425d2..c16922d8 100644 --- a/saslauthd/md5.c +++ b/saslauthd/md5.c @@ -397,9 +397,9 @@ void _saslauthd_hmac_md5_init(HMAC_MD5_CTX *hmac, _saslauthd_MD5Update(&hmac->octx, k_opad, 64); /* apply outer pad */ /* scrub the pads and key context (if used) */ - MD5_memset(&k_ipad, 0, sizeof(k_ipad)); - MD5_memset(&k_opad, 0, sizeof(k_opad)); - MD5_memset(&tk, 0, sizeof(tk)); + MD5_memset(k_ipad, 0, sizeof(k_ipad)); + MD5_memset(k_opad, 0, sizeof(k_opad)); + MD5_memset(tk, 0, sizeof(tk)); /* and we're done. */ } @@ -424,7 +424,7 @@ void _saslauthd_hmac_md5_precalc(HMAC_MD5_STATE *state, state->istate[lupe] = htonl(hmac.ictx.state[lupe]); state->ostate[lupe] = htonl(hmac.octx.state[lupe]); } - MD5_memset(&hmac, 0, sizeof(hmac)); + MD5_memset((POINTER)&hmac, 0, sizeof(hmac)); } @@ -432,7 +432,7 @@ void _saslauthd_hmac_md5_import(HMAC_MD5_CTX *hmac, HMAC_MD5_STATE *state) { unsigned lupe; - MD5_memset(hmac, 0, sizeof(HMAC_MD5_CTX)); + MD5_memset((POINTER)hmac, 0, sizeof(HMAC_MD5_CTX)); for (lupe = 0; lupe < 4; lupe++) { hmac->ictx.state[lupe] = ntohl(state->istate[lupe]); hmac->octx.state[lupe] = ntohl(state->ostate[lupe]); From 5e4395aaf4d91aba66649c9915e38d343d000ef7 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Fri, 28 Feb 2025 12:07:25 -0500 Subject: [PATCH] Add compatibility for gcc 15 (#869) Fedora 42 is going to use gcc 15 which changes some warnings into errors. Address the issues raised. The issues addressed include: - The RETURN macro is defined differently in two places. Rename one. - Both atexit and the sigint and sigterm actions call server_exit(). The function arguments diff. Introduce a new generic signal handler to call server_exit() for sigint and sigterm signals. Signed-off-by: Rob Crittenden Signed-off-by: mark.yang --- lib/auxprop.c | 2 +- lib/canonusr.c | 6 +++--- lib/client.c | 6 +++--- lib/common.c | 40 +++++++++++++++++++------------------- lib/saslint.h | 8 ++++---- lib/server.c | 32 +++++++++++++++--------------- saslauthd/auth_sasldb.c | 4 +--- saslauthd/saslauthd-main.c | 12 ++++++++---- saslauthd/saslauthd-main.h | 5 +++-- 9 files changed, 59 insertions(+), 56 deletions(-) diff --git a/lib/auxprop.c b/lib/auxprop.c index 1b0162db..0d465a2d 100644 --- a/lib/auxprop.c +++ b/lib/auxprop.c @@ -780,7 +780,7 @@ int sasl_auxprop_request(sasl_conn_t *conn, const char **propnames) } result = prop_request(sconn->sparams->propctx, propnames); - RETURN(conn, result); + RETURN_VAL(conn, result); } diff --git a/lib/canonusr.c b/lib/canonusr.c index 66f7e112..654a72ed 100644 --- a/lib/canonusr.c +++ b/lib/canonusr.c @@ -192,7 +192,7 @@ int _sasl_canon_user(sasl_conn_t *conn, oparams->user = conn->user_buf; } - RETURN(conn, result); + RETURN_VAL(conn, result); } /* Lookup all properties for authentication and/or authorization identity. */ @@ -256,7 +256,7 @@ static int _sasl_auxprop_lookup_user_props (sasl_conn_t *conn, } #endif - RETURN(conn, result); + RETURN_VAL(conn, result); } /* default behavior: @@ -285,7 +285,7 @@ int _sasl_canon_user_lookup (sasl_conn_t *conn, oparams); } - RETURN(conn, result); + RETURN_VAL(conn, result); } void _sasl_canonuser_free() diff --git a/lib/client.c b/lib/client.c index 3784bb0e..281285b8 100644 --- a/lib/client.c +++ b/lib/client.c @@ -435,7 +435,7 @@ int sasl_client_new(const char *service, &client_idle, serverFQDN, iplocalport, ipremoteport, prompt_supp, &global_callbacks_client); - if (result != SASL_OK) RETURN(*pconn, result); + if (result != SASL_OK) RETURN_VAL(*pconn, result); utils = _sasl_alloc_utils(*pconn, &global_callbacks_client); if (utils == NULL) { @@ -879,7 +879,7 @@ int sasl_client_start(sasl_conn_t *conn, done: if (ordered_mechs != NULL) c_conn->cparams->utils->free(ordered_mechs); - RETURN(conn, result); + RETURN_VAL(conn, result); } /* do a single authentication step. @@ -952,7 +952,7 @@ int sasl_client_step(sasl_conn_t *conn, } } - RETURN(conn,result); + RETURN_VAL(conn,result); } /* returns the length of all the mechanisms diff --git a/lib/common.c b/lib/common.c index d9104c89..e9d58d1b 100644 --- a/lib/common.c +++ b/lib/common.c @@ -303,7 +303,7 @@ int sasl_encode(sasl_conn_t *conn, const char *input, result = sasl_encodev(conn, &tmp, 1, output, outputlen); - RETURN(conn, result); + RETURN_VAL(conn, result); } /* Internal function that doesn't do any verification */ @@ -389,7 +389,7 @@ _sasl_encodev (sasl_conn_t *conn, (*p_num_packets)++; - RETURN(conn, result); + RETURN_VAL(conn, result); } /* security-encode an iovec */ @@ -434,7 +434,7 @@ int sasl_encodev(sasl_conn_t *conn, *output = conn->encode_buf->data; *outputlen = (unsigned) conn->encode_buf->curlen; - RETURN(conn, result); + RETURN_VAL(conn, result); } /* This might be better to check on a per-plugin basis, but I think @@ -592,7 +592,7 @@ int sasl_encodev(sasl_conn_t *conn, sasl_FREE(cur_invec); } - RETURN(conn, result); + RETURN_VAL(conn, result); } /* output is only valid until next call to sasl_decode */ @@ -609,7 +609,7 @@ int sasl_decode(sasl_conn_t *conn, if(!conn->props.maxbufsize) { sasl_seterror(conn, 0, "called sasl_decode with application that does not support security layers"); - RETURN(conn, SASL_TOOWEAK); + RETURN_VAL(conn, SASL_TOOWEAK); } if(conn->oparams.decode == NULL) @@ -623,7 +623,7 @@ int sasl_decode(sasl_conn_t *conn, if(inputlen > conn->props.maxbufsize) { sasl_seterror(conn, 0, "input too large for default sasl_decode"); - RETURN(conn,SASL_BUFOVER); + RETURN_VAL(conn,SASL_BUFOVER); } if(!conn->decode_buf) @@ -644,7 +644,7 @@ int sasl_decode(sasl_conn_t *conn, /* NULL an empty buffer (for misbehaved applications) */ if (*outputlen == 0) *output = NULL; - RETURN(conn, result); + RETURN_VAL(conn, result); } INTERROR(conn, SASL_FAIL); @@ -738,11 +738,11 @@ int _sasl_conn_init(sasl_conn_t *conn, result = sasl_setprop(conn, SASL_IPLOCALPORT, iplocalport); if(result != SASL_OK) - RETURN(conn, result); + RETURN_VAL(conn, result); result = sasl_setprop(conn, SASL_IPREMOTEPORT, ipremoteport); if(result != SASL_OK) - RETURN(conn, result); + RETURN_VAL(conn, result); conn->encode_buf = NULL; conn->context = NULL; @@ -787,7 +787,7 @@ int _sasl_conn_init(sasl_conn_t *conn, if(result != SASL_OK) MEMERROR( conn ); - RETURN(conn, SASL_OK); + RETURN_VAL(conn, SASL_OK); } int _sasl_common_init(sasl_global_callbacks_t *global_callbacks) @@ -1068,11 +1068,11 @@ int sasl_getprop(sasl_conn_t *conn, int propnum, const void **pvalue) } else if(result == SASL_NOTDONE) { sasl_seterror(conn, SASL_NOLOG, "Information that was requested is not yet available."); - RETURN(conn, result); + RETURN_VAL(conn, result); } else if(result != SASL_OK) { INTERROR(conn, result); } else - RETURN(conn, result); + RETURN_VAL(conn, result); } /* set property in SASL connection state @@ -1146,7 +1146,7 @@ int sasl_setprop(sasl_conn_t *conn, int propnum, const void *value) if(props->maxbufsize == 0 && props->min_ssf != 0) { sasl_seterror(conn, 0, "Attempt to disable security layers (maxoutbuf == 0) with min_ssf > 0"); - RETURN(conn, SASL_TOOWEAK); + RETURN_VAL(conn, SASL_TOOWEAK); } conn->props = *props; @@ -1168,7 +1168,7 @@ int sasl_setprop(sasl_conn_t *conn, int propnum, const void *value) } else if (_sasl_ipfromstring(ipremoteport, NULL, 0) != SASL_OK) { sasl_seterror(conn, 0, "Bad IPREMOTEPORT value"); - RETURN(conn, SASL_BADPARAM); + RETURN_VAL(conn, SASL_BADPARAM); } else { strcpy(conn->ipremoteport, ipremoteport); conn->got_ip_remote = 1; @@ -1209,7 +1209,7 @@ int sasl_setprop(sasl_conn_t *conn, int propnum, const void *value) } else if (_sasl_ipfromstring(iplocalport, NULL, 0) != SASL_OK) { sasl_seterror(conn, 0, "Bad IPLOCALPORT value"); - RETURN(conn, SASL_BADPARAM); + RETURN_VAL(conn, SASL_BADPARAM); } else { strcpy(conn->iplocalport, iplocalport); conn->got_ip_local = 1; @@ -1302,7 +1302,7 @@ int sasl_setprop(sasl_conn_t *conn, int propnum, const void *value) result = SASL_BADPARAM; } - RETURN(conn, result); + RETURN_VAL(conn, result); } /* this is apparently no longer a user function */ @@ -1708,7 +1708,7 @@ _sasl_proxy_policy(sasl_conn_t *conn, (memcmp(auth_identity, requested_user, rlen) != 0)) { sasl_seterror(conn, 0, "Requested identity not authenticated identity"); - RETURN(conn, SASL_BADAUTH); + RETURN_VAL(conn, SASL_BADAUTH); } return SASL_OK; @@ -1809,7 +1809,7 @@ int _sasl_getcallback(sasl_conn_t * conn, *pproc = NULL; *pcontext = NULL; sasl_seterror(conn, SASL_NOLOG, "Unable to find a callback: %d", callbackid); - RETURN(conn,SASL_FAIL); + RETURN_VAL(conn,SASL_FAIL); } @@ -2405,10 +2405,10 @@ int sasl_listmech(sasl_conn_t *conn, if(!conn) { return SASL_BADPARAM; } else if(conn->type == SASL_CONN_SERVER) { - RETURN(conn, _sasl_server_listmech(conn, user, prefix, sep, suffix, + RETURN_VAL(conn, _sasl_server_listmech(conn, user, prefix, sep, suffix, result, plen, pcount)); } else if (conn->type == SASL_CONN_CLIENT) { - RETURN(conn, _sasl_client_listmech(conn, prefix, sep, suffix, + RETURN_VAL(conn, _sasl_client_listmech(conn, prefix, sep, suffix, result, plen, pcount)); } diff --git a/lib/saslint.h b/lib/saslint.h index ebade78f..77fbb1b5 100644 --- a/lib/saslint.h +++ b/lib/saslint.h @@ -74,22 +74,22 @@ * memory errors. * -Only errors (error codes < SASL_OK) should be remembered */ -#define RETURN(conn, val) { if(conn && (val) < SASL_OK) \ +#define RETURN_VAL(conn, val) { if(conn && (val) < SASL_OK) \ (conn)->error_code = (val); \ return (val); } #define MEMERROR(conn) {\ if(conn) sasl_seterror( (conn), 0, \ "Out of Memory in " __FILE__ " near line %d", __LINE__ ); \ - RETURN(conn, SASL_NOMEM) } + RETURN_VAL(conn, SASL_NOMEM) } #define PARAMERROR(conn) {\ if(conn) sasl_seterror( (conn), SASL_NOLOG, \ "Parameter error in " __FILE__ " near line %d", __LINE__ ); \ - RETURN(conn, SASL_BADPARAM) } + RETURN_VAL(conn, SASL_BADPARAM) } #define INTERROR(conn, val) {\ if(conn) sasl_seterror( (conn), 0, \ "Internal Error %d in " __FILE__ " near line %d", (val),\ __LINE__ ); \ - RETURN(conn, (val)) } + RETURN_VAL(conn, (val)) } #ifndef PATH_MAX # ifdef WIN32 diff --git a/lib/server.c b/lib/server.c index bff461f8..4ea27643 100644 --- a/lib/server.c +++ b/lib/server.c @@ -155,7 +155,7 @@ int sasl_setpass(sasl_conn_t *conn, (current_mech == NULL) ) { sasl_seterror( conn, SASL_NOLOG, "No current SASL mechanism available"); - RETURN(conn, SASL_BADPARAM); + RETURN_VAL(conn, SASL_BADPARAM); } /* Do we want to store SASL_AUX_PASSWORD_PROP (plain text)? and @@ -297,7 +297,7 @@ int sasl_setpass(sasl_conn_t *conn, } } - RETURN(conn, result); + RETURN_VAL(conn, result); } /* local mechanism which disposes of server */ @@ -991,7 +991,7 @@ _sasl_transition(sasl_conn_t * conn, NULL, 0, SASL_SET_CREATE | flags); } - RETURN(conn,result); + RETURN_VAL(conn,result); } @@ -1367,7 +1367,7 @@ static int do_authorization(sasl_server_conn_t *s_conn) (s_conn->user_realm ? (unsigned) strlen(s_conn->user_realm) : 0), s_conn->sparams->propctx); - RETURN(&s_conn->base, ret); + RETURN_VAL(&s_conn->base, ret); } @@ -1484,7 +1484,7 @@ int sasl_server_start(sasl_conn_t *conn, if (result != SASL_OK) { /* The library will eventually be freed, don't sweat it */ - RETURN(conn, result); + RETURN_VAL(conn, result); } } @@ -1573,7 +1573,7 @@ int sasl_server_start(sasl_conn_t *conn, conn->oparams.doneflag = 0; } - RETURN(conn,result); + RETURN_VAL(conn,result); } @@ -1701,7 +1701,7 @@ int sasl_server_step(sasl_conn_t *conn, conn->oparams.doneflag = 0; } - RETURN(conn, ret); + RETURN_VAL(conn, ret); } /* returns the length of all the mechanisms @@ -1950,7 +1950,7 @@ static int _sasl_checkpass(sasl_conn_t *conn, if (result != SASL_OK) sasl_seterror(conn, SASL_NOLOG, "checkpass failed"); - RETURN(conn, result); + RETURN_VAL(conn, result); } /* check if a plaintext password is valid @@ -1990,7 +1990,7 @@ int sasl_checkpass(sasl_conn_t *conn, result = _sasl_canon_user(conn, user, userlen, SASL_CU_AUTHID | SASL_CU_AUTHZID, &(conn->oparams)); - if(result != SASL_OK) RETURN(conn, result); + if(result != SASL_OK) RETURN_VAL(conn, result); user = conn->oparams.user; /* Check the password and lookup additional properties */ @@ -2001,7 +2001,7 @@ int sasl_checkpass(sasl_conn_t *conn, result = do_authorization((sasl_server_conn_t *)conn); } - RETURN(conn,result); + RETURN_VAL(conn,result); } /* check if a user exists on server @@ -2074,7 +2074,7 @@ int sasl_user_exists(sasl_conn_t *conn, sasl_seterror(conn, SASL_NOLOG, "no plaintext password verifier?"); } - RETURN(conn, result); + RETURN_VAL(conn, result); } /* check if an apop exchange is valid @@ -2136,7 +2136,7 @@ int sasl_checkapop(sasl_conn_t *conn, if (!user_end || strspn(user_end + 1, "0123456789abcdef") != 32) { sasl_seterror(conn, 0, "Bad Digest"); - RETURN(conn,SASL_BADPROT); + RETURN_VAL(conn,SASL_BADPROT); } user_len = (size_t)(user_end - response); @@ -2148,7 +2148,7 @@ int sasl_checkapop(sasl_conn_t *conn, if(result != SASL_OK) { sasl_FREE(user); - RETURN(conn, result); + RETURN_VAL(conn, result); } /* erase the plaintext password */ @@ -2163,7 +2163,7 @@ int sasl_checkapop(sasl_conn_t *conn, &(conn->oparams)); sasl_FREE(user); - if(result != SASL_OK) RETURN(conn, result); + if(result != SASL_OK) RETURN_VAL(conn, result); /* Do APOP verification */ result = _sasl_auxprop_verify_apop(conn, conn->oparams.authid, @@ -2178,11 +2178,11 @@ int sasl_checkapop(sasl_conn_t *conn, conn->oparams.authid = NULL; } - RETURN(conn, result); + RETURN_VAL(conn, result); #else /* sasl_checkapop was disabled at compile time */ sasl_seterror(conn, SASL_NOLOG, "sasl_checkapop called, but was disabled at compile time"); - RETURN(conn, SASL_NOMECH); + RETURN_VAL(conn, SASL_NOMECH); #endif /* DO_SASL_CHECKAPOP */ } diff --git a/saslauthd/auth_sasldb.c b/saslauthd/auth_sasldb.c index b6aaa393..08db1892 100644 --- a/saslauthd/auth_sasldb.c +++ b/saslauthd/auth_sasldb.c @@ -51,9 +51,7 @@ #include "../sasldb/sasldb.h" static int -vf(void *context __attribute__((unused)), - char *file __attribute__((unused)), - int type __attribute__((unused))) +vf(void) { /* always say ok */ return SASL_OK; diff --git a/saslauthd/saslauthd-main.c b/saslauthd/saslauthd-main.c index ca5b7256..68ffd02f 100644 --- a/saslauthd/saslauthd-main.c +++ b/saslauthd/saslauthd-main.c @@ -593,7 +593,7 @@ void signal_setup() { /************************************************************** * Handler for SIGTERM **************************************************************/ - act_sigterm.sa_handler = server_exit; + act_sigterm.sa_handler = handle_exit; sigemptyset(&act_sigterm.sa_mask); if (sigaction(SIGTERM, &act_sigterm, NULL) != 0) { @@ -606,7 +606,7 @@ void signal_setup() { /************************************************************** * Handler for SIGINT **************************************************************/ - act_sigint.sa_handler = server_exit; + act_sigint.sa_handler = handle_exit; sigemptyset(&act_sigint.sa_mask); if (sigaction(SIGINT, &act_sigint, NULL) != 0) { @@ -876,7 +876,7 @@ pid_t have_baby() { /************************************************************* * Reap in all the dead children **************************************************************/ -void handle_sigchld() { +void handle_sigchld(__attribute__((unused)) int sig) { pid_t pid; while ((pid = waitpid(-1, 0, WNOHANG)) > 0) { @@ -888,11 +888,15 @@ void handle_sigchld() { return; } +void handle_exit(__attribute__((unused)) int sig) { + server_exit(); +} + /************************************************************* * Do some final cleanup here. **************************************************************/ -void server_exit() { +void server_exit(void) { /********************************************************* * If we're not the master process, don't do anything diff --git a/saslauthd/saslauthd-main.h b/saslauthd/saslauthd-main.h index 754626c6..29998f03 100644 --- a/saslauthd/saslauthd-main.h +++ b/saslauthd/saslauthd-main.h @@ -96,8 +96,9 @@ extern void set_mech_option(const char *); extern void set_run_path(const char *); extern void signal_setup(); extern void detach_tty(); -extern void handle_sigchld(); -extern void server_exit(); +extern void handle_sigchld(int sig); +extern void handle_exit(int sig); +extern void server_exit(void); extern pid_t have_baby(); /* ipc api delcarations */