Warning fixes (%m -> strerror(errno)).

diff --git a/etc/uams/uams_dhx_pam.c b/etc/uams/uams_dhx_pam.c
index 2a30f670812c2d25f1d135383c5e89e1d3a6a123..8493c650c0a08b6c47acd5658b57d720d3902c74 100644 (file)
--- a/etc/uams/uams_dhx_pam.c
+++ b/etc/uams/uams_dhx_pam.c
@@ -1,5 +1,5 @@
 /*
- * $Id: uams_dhx_pam.c,v 1.17 2001-11-13 15:01:38 rufustfirefly Exp $
+ * $Id: uams_dhx_pam.c,v 1.18 2001-11-16 15:45:15 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu) 
@@ -83,7 +83,8 @@ static int PAM_conv (int num_msg,
 
   if (num_msg < 1) {
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM DHX Conversation Err -- %m");
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM DHX Conversation Err -- %s",
+                 strerror(errno));
     /* Log Entry */
     return PAM_CONV_ERR;
   }
@@ -93,7 +94,8 @@ static int PAM_conv (int num_msg,
 
   if (!reply) {
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM DHX Conversation Err -- %m");
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM DHX Conversation Err -- %s",
+                 strerror(errno));
     /* Log Entry */
     return PAM_CONV_ERR;
   }
@@ -105,7 +107,8 @@ static int PAM_conv (int num_msg,
     case PAM_PROMPT_ECHO_ON:
       if (!(string = COPY_STRING(PAM_username))) {
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: username failure -- %m");
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: username failure -- %s",
+                 strerror(errno));
     /* Log Entry */
        goto pam_fail_conv;
       }
@@ -113,7 +116,8 @@ static int PAM_conv (int num_msg,
     case PAM_PROMPT_ECHO_OFF:
       if (!(string = COPY_STRING(PAM_password))) {
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: passwd failure: --: %m");
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: passwd failure: --: %s",
+                 strerror(errno));
     /* Log Entry */
        goto pam_fail_conv;
       }
@@ -127,7 +131,8 @@ static int PAM_conv (int num_msg,
     case PAM_ERROR_MSG:
     default:
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: Binary_Prompt -- %m");
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: Binary_Prompt -- %s",
+                 strerror(errno));
     /* Log Entry */
       goto pam_fail_conv;
     }
@@ -141,7 +146,8 @@ static int PAM_conv (int num_msg,
 
   *resp = reply;
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: PAM Success -- %m");
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: PAM Success -- %s",
+                 strerror(errno));
     /* Log Entry */
   return PAM_SUCCESS;
 
@@ -158,7 +164,8 @@ pam_fail_conv:
   }
   free(reply);
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM DHX Conversation Err -- %m");
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM DHX Conversation Err -- %s",
+                 strerror(errno));
     /* Log Entry */
     return PAM_CONV_ERR;
 }
@@ -186,7 +193,8 @@ static int dhx_setup(void *obj, char *ibuf, int ibuflen,
     /* get the client's public key */
     if (!(bn = BN_bin2bn(ibuf, KEYSIZE, NULL))) {
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM No Public Key -- %m");
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM No Public Key -- %s",
+                 strerror(errno));
     /* Log Entry */
       return AFPERR_PARAM;
     }
@@ -195,7 +203,8 @@ static int dhx_setup(void *obj, char *ibuf, int ibuflen,
     if (!(gbn = BN_bin2bn(&g, sizeof(g), NULL))) {
       BN_clear_free(bn);
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM No Primes: GBN -- %m");
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM No Primes: GBN -- %s",
+                 strerror(errno));
     /* Log Entry */
       return AFPERR_PARAM;
     }
@@ -204,7 +213,8 @@ static int dhx_setup(void *obj, char *ibuf, int ibuflen,
       BN_free(gbn);
       BN_clear_free(bn);
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM No Primes: PBN -- %m");
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM No Primes: PBN -- %s",
+                 strerror(errno));
     /* Log Entry */
       return AFPERR_PARAM;
     }
@@ -215,7 +225,8 @@ static int dhx_setup(void *obj, char *ibuf, int ibuflen,
       BN_free(gbn);
       BN_clear_free(bn);
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM DH was equal to DH_New... Go figure... -- %m");
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM DH was equal to DH_New... Go figure... -- %s",
+                 strerror(errno));
     /* Log Entry */
       return AFPERR_PARAM;
     }
@@ -225,7 +236,8 @@ static int dhx_setup(void *obj, char *ibuf, int ibuflen,
     dh->g = gbn;
     if (!DH_generate_key(dh) || (BN_num_bytes(dh->pub_key) > KEYSIZE)) {
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: Err Generating Key -- Not enough Space? -- %m");
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: Err Generating Key -- Not enough Space? -- %s",
+                 strerror(errno));
     /* Log Entry */
     goto pam_fail;
     }
@@ -253,7 +265,8 @@ static int dhx_setup(void *obj, char *ibuf, int ibuflen,
                             &i) < 0) {
       *rbuflen = 0;
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: Buffer Encryption Err. -- %m");
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: Buffer Encryption Err. -- %s",
+                 strerror(errno));
     /* Log Entry */
       goto pam_fail;
     }    
@@ -265,7 +278,8 @@ static int dhx_setup(void *obj, char *ibuf, int ibuflen,
                             (void *) &buf, NULL) < 0) {
       *rbuflen = 0;
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: Signature Retieval Failure -- %m");
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: Signature Retieval Failure -- %s",
+                 strerror(errno));
     /* Log Entry */
       goto pam_fail;
     }
@@ -286,7 +300,8 @@ pam_fail:
     BN_free(bn);
     DH_free(dh);
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: Fail - Cast Encryption -- %m");
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: Fail - Cast Encryption -- %s",
+                 strerror(errno));
     /* Log Entry */
     return AFPERR_PARAM;
 }
@@ -307,7 +322,8 @@ static int pam_login(void *obj, struct passwd **uam_pwd,
     if (uam_afpserver_option(obj, UAM_OPTION_USERNAME, (void *) &buf,
                             &i) < 0) {
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: uam_afpserver_option didn't meet uam_option_username  -- %m");
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: uam_afpserver_option didn't meet uam_option_username  -- %s",
+                 strerror(errno));
     /* Log Entry */
       return AFPERR_PARAM;
     }
@@ -315,7 +331,8 @@ static int pam_login(void *obj, struct passwd **uam_pwd,
     len = (unsigned char) *ibuf++;
     if ( len > i ) {
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: Signature Retieval Failure -- %m");
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: Signature Retieval Failure -- %s",
+                 strerror(errno));
     /* Log Entry */
        return( AFPERR_PARAM );
     }
@@ -328,7 +345,8 @@ static int pam_login(void *obj, struct passwd **uam_pwd,
 
     if (( dhxpwd = uam_getname(buf, i)) == NULL ) {
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: User entered a null value -- %m");
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: User entered a null value -- %s",
+                 strerror(errno));
     /* Log Entry */
        return AFPERR_PARAM;
     }
@@ -354,7 +372,8 @@ static int pam_logincont(void *obj, struct passwd **uam_pwd,
     memcpy(&sessid, ibuf, sizeof(sessid));
     if (sessid != dhxhash(obj)) {
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM Session ID - DHXHash Mismatch -- %m");
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM Session ID - DHXHash Mismatch -- %s",
+                 strerror(errno));
     /* Log Entry */
       return AFPERR_PARAM;
     }
@@ -412,7 +431,8 @@ static int pam_logincont(void *obj, struct passwd **uam_pwd,
                          &pamh);
     if (PAM_error != PAM_SUCCESS) {
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: PAM_Error: %s -- %m", pam_strerror(pamh,PAM_error));
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: PAM_Error: %s -- %s",
+                 pam_strerror(pamh,PAM_error), strerror(errno));
     /* Log Entry */
       goto logincont_err;
     }
@@ -425,7 +445,8 @@ static int pam_logincont(void *obj, struct passwd **uam_pwd,
       if (PAM_error == PAM_MAXTRIES) 
        err = AFPERR_PWDEXPR;
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: PAM_Error: %s -- %m", pam_strerror(pamh, PAM_error));
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: PAM_Error: %s -- %s",
+                 pam_strerror(pamh, PAM_error), strerror(errno));
     /* Log Entry */
       goto logincont_err;
     }      
@@ -439,7 +460,8 @@ static int pam_logincont(void *obj, struct passwd **uam_pwd,
        err = AFPERR_PWDCHNG;
 #endif
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: PAM_Error: %s -- %m", pam_strerror(pamh, PAM_error));
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: PAM_Error: %s -- %s",
+                 pam_strerror(pamh, PAM_error), strerror(errno));
     /* Log Entry */
       goto logincont_err;
     }
@@ -450,7 +472,8 @@ static int pam_logincont(void *obj, struct passwd **uam_pwd,
     PAM_error = pam_setcred(pamh, PAM_CRED_ESTABLISH);
     if (PAM_error != PAM_SUCCESS) {
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: PAM_Error: %s -- %m", pam_strerror(pamh, PAM_error));
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: PAM_Error: %s -- %s",
+                 pam_strerror(pamh, PAM_error), strerror(errno));
     /* Log Entry */
       goto logincont_err;
     }
@@ -458,7 +481,8 @@ static int pam_logincont(void *obj, struct passwd **uam_pwd,
     PAM_error = pam_open_session(pamh, 0);
     if (PAM_error != PAM_SUCCESS) {
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: PAM_Error: %s -- %m", pam_strerror(pamh, PAM_error));
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: PAM_Error: %s -- %s",
+                 pam_strerror(pamh, PAM_error), strerror(errno));
     /* Log Entry */
       goto logincont_err;
     }
@@ -515,7 +539,8 @@ static int pam_changepw(void *obj, char *username,
     /* check out the session id */
     if (sessid != dhxhash(obj)) {
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: Session ID not Equal to DHX Hash -- %m");
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: Session ID not Equal to DHX Hash -- %s",
+                 strerror(errno));
     /* Log Entry */
       return AFPERR_PARAM;
     }
@@ -524,7 +549,8 @@ static int pam_changepw(void *obj, char *username,
     if (uam_afpserver_option(obj, UAM_OPTION_HOSTNAME,
                             (void *) &hostname, NULL) < 0) {
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: Hostname Null?? -- %m");
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: Hostname Null?? -- %s",
+                 strerror(errno));
     /* Log Entry */
       return AFPERR_MISC;
     }
@@ -538,7 +564,8 @@ static int pam_changepw(void *obj, char *username,
      * get sent back an incremented random number. */
     if (!(bn1 = BN_bin2bn(ibuf, KEYSIZE, NULL))) {
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: Random Number Not the same or not incremented-- %m");
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: Random Number Not the same or not incremented-- %s",
+                 strerror(errno));
     /* Log Entry */
       return AFPERR_PARAM;
     }
@@ -546,7 +573,8 @@ static int pam_changepw(void *obj, char *username,
     if (!(bn2 = BN_bin2bn(randbuf, sizeof(randbuf), NULL))) {
       BN_free(bn1);
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: Random Number Not the same or not incremented -- %m");
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: Random Number Not the same or not incremented -- %s",
+                 strerror(errno));
     /* Log Entry */
       return AFPERR_PARAM;
     }
@@ -559,7 +587,8 @@ static int pam_changepw(void *obj, char *username,
       BN_free(bn2);
       BN_free(bn1);
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: Random Number did not Zero -- %m");
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: Random Number did not Zero -- %s",
+                 strerror(errno));
     /* Log Entry */
       return AFPERR_PARAM;
     }
@@ -573,7 +602,8 @@ static int pam_changepw(void *obj, char *username,
     if (!BN_is_one(bn3)) {
       BN_free(bn3);
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: After Random Number not Zero, is it one more? -- %m");
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: After Random Number not Zero, is it one more? -- %s",
+                 strerror(errno));
     /* Log Entry */
       return AFPERR_PARAM;
     }
@@ -590,7 +620,8 @@ static int pam_changepw(void *obj, char *username,
                          &lpamh);
     if (PAM_error != PAM_SUCCESS) {
     /* Log Entry */
-           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: Needless to say, PAM_error is != to PAM_SUCCESS -- %m");
+           syslog(LOG_INFO, "uams_dhx_pam.c :PAM: Needless to say, PAM_error is != to PAM_SUCCESS -- %s",
+                 strerror(errno));
     /* Log Entry */
       return AFPERR_PARAM;
     }