I think only one real bug (at the end), but it's benign.

+ cvs diff -u ./src/WINNT/afsd/smb.h
Index: ./src/WINNT/afsd/smb.h
===================================================================
RCS file: /cvs/openafs/src/WINNT/afsd/smb.h,v
retrieving revision 1.5
diff -u -r1.5 smb.h
--- ./src/WINNT/afsd/smb.h      21 Nov 2001 06:44:28 -0000      1.5
+++ ./src/WINNT/afsd/smb.h      14 Nov 2003 15:07:21 -0000
@@ -344,6 +344,10 @@

extern smb_user_t *smb_FindUID(smb_vc_t *vcp, unsigned short uid, int flags);

+extern smb_username_t *smb_FindUserByName(char *usern, char *machine, int flags);
+
+extern smb_user_t *smb_FindUserByNameThisSession(smb_vc_t *vcp, char *usern);
+
 extern void smb_ReleaseUID(smb_user_t *uidp);

 extern cm_user_t *smb_GetUser(smb_vc_t *vcp, smb_packet_t *inp);
@@ -422,6 +426,8 @@

 extern void smb_FormatResponsePacket(smb_vc_t *vcp, smb_packet_t *inp,
        smb_packet_t *op);
+
+extern char *myCrt_2Dispatch(int i);

extern unsigned int smb_Attributes(cm_scache_t *scp);

+ cvs diff -u ./src/WINNT/afsd/smb.c
Index: ./src/WINNT/afsd/smb.c
===================================================================
RCS file: /cvs/openafs/src/WINNT/afsd/smb.c,v
retrieving revision 1.12
diff -u -r1.12 smb.c
--- ./src/WINNT/afsd/smb.c      25 Aug 2003 18:24:22 -0000      1.12
+++ ./src/WINNT/afsd/smb.c      14 Nov 2003 15:07:23 -0000
@@ -1095,9 +1095,9 @@
                   smb_localNamep, this_share, (print_afs ? "/afs" : "\0"),
                   pathName);
           num_shares++;
-          while (*this_share != NULL) this_share++;  /* find next NULL */
+          while (*this_share != 0) this_share++;  /* find next NULL */
           this_share++;   /* skip past the NULL */
-        } while (*this_share != NULL);  /* stop at final NULL */
+        } while (*this_share != 0);  /* stop at final NULL */

         return num_shares;
 }
+ cvs diff -u ./src/WINNT/afsd/cm_config.c
Index: ./src/WINNT/afsd/cm_config.c
===================================================================
RCS file: /cvs/openafs/src/WINNT/afsd/cm_config.c,v
retrieving revision 1.7
diff -u -r1.7 cm_config.c
--- ./src/WINNT/afsd/cm_config.c        4 Nov 2002 20:43:50 -0000       1.7
+++ ./src/WINNT/afsd/cm_config.c        14 Nov 2003 15:07:23 -0000
@@ -552,7 +554,8 @@

 #if !defined(DJGPP) && !defined(AFS_WIN95_ENV)
        code = GetWindowsDirectory(wdir, sizeof(wdir));
-        if (code == 0 || code > sizeof(wdir)) return NULL;
+        if (code == 0 || code > sizeof(wdir))
+                       return 0;

        /* add trailing backslash, if required */
         tlen = strlen(wdir);
+ cvs diff -u ./src/WINNT/afsd/cm_scache.c
Index: ./src/WINNT/afsd/cm_scache.c
===================================================================
RCS file: /cvs/openafs/src/WINNT/afsd/cm_scache.c,v
retrieving revision 1.5
diff -u -r1.5 cm_scache.c
--- ./src/WINNT/afsd/cm_scache.c        8 Jan 2002 20:44:37 -0000       1.5
+++ ./src/WINNT/afsd/cm_scache.c        14 Nov 2003 15:07:24 -0000
@@ -964,5 +964,5 @@
                 }
         }
         lock_ReleaseWrite(&cm_scacheLock);
-        return NULL;
+        return 0;
 }
+ cvs diff -u ./src/WINNT/afsd/afsd_init.c
Index: ./src/WINNT/afsd/afsd_init.c
===================================================================
RCS file: /cvs/openafs/src/WINNT/afsd/afsd_init.c,v
retrieving revision 1.7
diff -u -r1.7 afsd_init.c
--- ./src/WINNT/afsd/afsd_init.c        6 Jun 2003 21:11:25 -0000       1.7
+++ ./src/WINNT/afsd/afsd_init.c        14 Nov 2003 15:07:25 -0000
@@ -587,7 +587,7 @@
           code = cm_GetVolumeByName(cm_rootCellp, cm_rootVolumeName, cm_rootUserp,
                                     &req, CM_FLAG_CREATE, &cm_rootVolumep);
           afsi_log("cm_GetVolumeByName code %x root vol %x", code,
-                   (code ? 0xffffffff : cm_rootVolumep));
+                   (code ? (cm_volume_t *)-1 : cm_rootVolumep));
           if (code != 0) {
             *reasonP = "can't find root volume in root cell";
             return -1;
@@ -606,7 +606,7 @@

         code = cm_GetSCache(&cm_rootFid, &cm_rootSCachep, cm_rootUserp, &req);
        afsi_log("cm_GetSCache code %x scache %x", code,
-                (code ? 0xffffffff : cm_rootSCachep));
+                (code ? (cm_scache_t *)-1 : cm_rootSCachep));
        if (code != 0) {
                *reasonP = "unknown error";
                return -1;
+ cvs diff -u ./src/bozo/bos.c
Index: ./src/bozo/bos.c
===================================================================
RCS file: /cvs/openafs/src/bozo/bos.c,v
retrieving revision 1.18
diff -u -r1.18 bos.c
--- ./src/bozo/bos.c    8 Aug 2003 20:27:58 -0000       1.18
+++ ./src/bozo/bos.c    14 Nov 2003 15:07:26 -0000
@@ -1500,7 +1500,7 @@

     /* Find out whether fileserver is running MR-AFS (has a scanner instance) */
     /* XXX this should really be done some other way, potentially by RPC */
-    tp = &tname;
+    tp = &tname[0];
     if (code = BOZO_GetInstanceParm(tconn, "fs", 3, &tp) == 0)
        mrafs = 1;

+ cvs diff -u ./src/bucoord/main.c
Index: ./src/bucoord/main.c
===================================================================
RCS file: /cvs/openafs/src/bucoord/main.c,v
retrieving revision 1.12
diff -u -r1.12 main.c
--- ./src/bucoord/main.c        15 Jul 2003 23:14:47 -0000      1.12
+++ ./src/bucoord/main.c        14 Nov 2003 15:07:26 -0000
@@ -391,11 +391,11 @@

 afs_int32
 doDispatch(targc, targv, dispatchCount)
-     char **targv[MAXV];
+     char *targv[MAXV];
      afs_int32 targc;
      afs_int32 dispatchCount;  /* to prevent infinite recursion */
 {
-    char **sargv[MAXV];
+    char *sargv[MAXV];
     afs_int32 sargc;
     afs_int32 code, c;
     FILE *fd;
@@ -489,7 +489,7 @@
      int argc;
      char **argv;
 {                              /*main */
-    char **targv[MAXV];                /*Ptr to parsed argv stuff */
+    char *targv[MAXV];         /*Ptr to parsed argv stuff */
     afs_int32 targc;           /*Num parsed arguments */
     afs_int32 code;            /*Return code */
     char *tp;                  /*Result of gets() */
+ cvs diff -u ./src/auth/cellconfig.c
Index: ./src/auth/cellconfig.c
===================================================================
RCS file: /cvs/openafs/src/auth/cellconfig.c,v
retrieving revision 1.33
diff -u -r1.33 cellconfig.c
--- ./src/auth/cellconfig.c     15 Jul 2003 23:14:41 -0000      1.33
+++ ./src/auth/cellconfig.c     14 Nov 2003 15:07:27 -0000
@@ -791,7 +791,7 @@
     afs_int32 cellHosts[AFSMAXCELLHOSTS];
     int numServers;
     int rc;
-    int *ttl;
+    int ttl;

     DNSce.cellInfo.numServers = 0;
     DNSce.next = NULL;

--
Joe Buehler


_______________________________________________ OpenAFS-devel mailing list [EMAIL PROTECTED] https://lists.openafs.org/mailman/listinfo/openafs-devel

Reply via email to