Changeset 862 for trunk/server/source3/passdb/pdb_smbpasswd.c

Timestamp:

May 13, 2014, 11:39:04 AM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/passdb/pdb_smbpasswd.c (modified) (3 diffs)

trunk/server/source3/passdb/pdb_smbpasswd.c

@@ -743 +743 @@
 
         char *status;
-        char linebuf[256];
+#define LINEBUF_SIZE 255
+        char linebuf[LINEBUF_SIZE + 1];
         char readbuf[1024];
         int c;
@@ -798 +799 @@
                 linebuf[0] = '\0';
 
-                status = fgets(linebuf, sizeof(linebuf), fp);
+                status = fgets(linebuf, LINEBUF_SIZE, fp);
                 if (status == NULL && ferror(fp)) {
                         pw_file_unlock(lockfd, &smbpasswd_state->pw_file_lock_depth);
@@ -1027 +1028 @@
 #endif
 
-        if(wr_len > sizeof(linebuf)) {
+        if(wr_len > LINEBUF_SIZE) {
                 DEBUG(0, ("mod_smbfilepwd_entry: line to write (%d) is too long.\n", wr_len+1));
                 pw_file_unlock(lockfd,&smbpasswd_state->pw_file_lock_depth);