Patch by Olaf: first argument of memset is a pointer.

diff --git a/NEWS b/NEWS
index ac2778f2184fcf822bd4c59e489cf6de385d3266..c9d4100b270f64f6009a0df6eef937ef87d2120a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Changes in 1.6.1
 * UPD: Improve --enable-fhs. [Olaf Hering]
 * FIX: Codepage file maccode.koi8-r is now correctly cleaned.
 * FIX: Fix init script location on SuSE. [Olaf]
+* FIX: Build fixes. [Olaf]
 
 Changes in 1.6.0
 ================

diff --git a/bin/afppasswd/afppasswd.c b/bin/afppasswd/afppasswd.c
index 65da4b9c9e0687fe1cf8bdb24e48040f93de34d0..983b18fa9b252c9238751b2f32263e103c4cad89 100644 (file)
--- a/bin/afppasswd/afppasswd.c
+++ b/bin/afppasswd/afppasswd.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: afppasswd.c,v 1.9 2001-10-25 20:42:55 srittau Exp $
+ * $Id: afppasswd.c,v 1.9.8.1 2003-01-21 16:33:30 srittau Exp $
  *
  * Copyright 1999 (c) Adrian Sun (asun@u.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -114,7 +114,7 @@ static void convert_passwd(char *buf, char *newpwd, const int keyfd)
       /* decrypt the password */
       ecb_encrypt((C_Block *) buf, (C_Block *) buf, schedule, DES_DECRYPT);
     }
-    memset(schedule, 0, sizeof(schedule));      
+    memset(&schedule, 0, sizeof(schedule));      
   }
 
   if (newpwd) {

diff --git a/etc/uams/uams_randnum.c b/etc/uams/uams_randnum.c
index 863d3403b8dfe1e5e99638f97c5dc5e7229dcf7f..1fcb603cc9a12fc017442385ada995a4477eca0c 100644 (file)
--- a/etc/uams/uams_randnum.c
+++ b/etc/uams/uams_randnum.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: uams_randnum.c,v 1.11 2002-09-29 23:30:20 sibaz Exp $
+ * $Id: uams_randnum.c,v 1.11.2.1 2003-01-21 16:33:31 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu) 
@@ -217,7 +217,7 @@ afppasswd_found:
        /* decrypt the password */
        ecb_encrypt((C_Block *) p, (C_Block *) p, schedule, DES_DECRYPT);
       }
-      memset(schedule, 0, sizeof(schedule));
+      memset(&schedule, 0, sizeof(schedule));
   }
 
   if (set) {
@@ -383,7 +383,7 @@ static int randnum_logincont(void *obj, struct passwd **uam_pwd,
   memset(seskey, 0, sizeof(seskey));
   ecb_encrypt((C_Block *) randbuf, (C_Block *) randbuf,
               seskeysched, DES_ENCRYPT);
-  memset(seskeysched, 0, sizeof(seskeysched));
+  memset(&seskeysched, 0, sizeof(seskeysched));
 
   /* test against what the client sent */
   if (memcmp( randbuf, ibuf, sizeof(randbuf) )) { /* != */
@@ -431,7 +431,7 @@ static int rand2num_logincont(void *obj, struct passwd **uam_pwd,
   /* test against client's reply */
   if (memcmp(randbuf, ibuf, sizeof(randbuf))) { /* != */
     memset(randbuf, 0, sizeof(randbuf));
-    memset(seskeysched, 0, sizeof(seskeysched));
+    memset(&seskeysched, 0, sizeof(seskeysched));
     return AFPERR_NOTAUTH;
   }
   ibuf += sizeof(randbuf);
@@ -440,7 +440,7 @@ static int rand2num_logincont(void *obj, struct passwd **uam_pwd,
   /* encrypt client's challenge and send back */
   ecb_encrypt( (C_Block *) ibuf, (C_Block *) rbuf,
               seskeysched, DES_ENCRYPT);
-  memset(seskeysched, 0, sizeof(seskeysched));
+  memset(&seskeysched, 0, sizeof(seskeysched));
   *rbuflen = sizeof(randbuf);
   
   *uam_pwd = randpwd;
@@ -495,7 +495,7 @@ static int randnum_changepw(void *obj, const char *username,
       err = randpass(pwd, passwdfile, ibuf + PASSWDLEN, sizeof(seskey), 1);
 
     /* zero out some fields */
-    memset(seskeysched, 0, sizeof(seskeysched));
+    memset(&seskeysched, 0, sizeof(seskeysched));
     memset(seskey, 0, sizeof(seskey));
     memset(ibuf, 0, sizeof(seskey)); /* old passwd */
     memset(ibuf + PASSWDLEN, 0, sizeof(seskey)); /* new passwd */