Fix mystrerious dereferencing

diff --git a/etc/afpd/uam.c b/etc/afpd/uam.c
index 588c0e273d544a40d612e86f99b5422873658b86..5c105e3181728d34aa85eed89680f8a1b7b5db31 100644 (file)
--- a/etc/afpd/uam.c
+++ b/etc/afpd/uam.c
@@ -363,7 +363,7 @@ int uam_afpserver_option(void *private, const int what, void *option,
 
     switch (what) {
     case UAM_OPTION_USERNAME:
-        *buf = obj->username;
+        *buf = &(obj->username[0]);
         if (len)
             *len = sizeof(obj->username) - 1;
         break;

diff --git a/etc/uams/uams_dhx_pam.c b/etc/uams/uams_dhx_pam.c
index e9f30dc1cd6e5af77f252f37589aa27ce83ebbb1..e83c2568708036817744212dd88fa2def76e29ff 100644 (file)
--- a/etc/uams/uams_dhx_pam.c
+++ b/etc/uams/uams_dhx_pam.c
@@ -375,7 +375,8 @@ static int pam_login_ext(void *obj, char *uname, struct passwd **uam_pwd,
                     char *rbuf, size_t *rbuflen)
 {
     char *username;
-    int len, ulen;
+    int len;
+    size_t ulen;
     u_int16_t  temp16;
 
     *rbuflen = 0;