diff options
| -rw-r--r-- | source3/include/proto.h | 2 | ||||
| -rw-r--r-- | source3/param/params.c | 2 | ||||
| -rw-r--r-- | source3/passdb/smbpass.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 1f3a251fec..faddbc6a49 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -677,6 +677,8 @@ void SMBNTencrypt(uchar *passwd, uchar *c8, uchar *p24); /*The following definitions come from smbpass.c */ +int pw_file_lock(char *name, int type, int secs); +int pw_file_unlock(int fd); struct smb_passwd *get_smbpwnam(char *name); /*The following definitions come from smbpasswd.c */ diff --git a/source3/param/params.c b/source3/param/params.c index 8ff3d59d28..8030e4ab58 100644 --- a/source3/param/params.c +++ b/source3/param/params.c @@ -313,7 +313,7 @@ BOOL pm_process(char *pszFileName,BOOL (*sfunc)(char *),BOOL (*pfunc)(char *,cha DEBUG(0,( "Unable to open configuration file \"%s\"!\n", pszParmFile)); else { - DEBUG(2,( "Processing configuration file \"%s\"\n", pszParmFile)); + DEBUG(3,("Processing configuration file \"%s\"\n", pszParmFile)); bRetval = enumerate_sections(fileIn, sfunc, pfunc); fclose(fileIn); } diff --git a/source3/passdb/smbpass.c b/source3/passdb/smbpass.c index 1f880881bc..cd4a7ccf66 100644 --- a/source3/passdb/smbpass.c +++ b/source3/passdb/smbpass.c @@ -58,8 +58,7 @@ do_pw_lock(int fd, int waitsecs, int type) return ret; } -int -pw_file_lock(char *name, int type, int secs) +int pw_file_lock(char *name, int type, int secs) { int fd = open(name, O_RDWR | O_CREAT, 0666); if (fd < 0) @@ -71,8 +70,7 @@ pw_file_lock(char *name, int type, int secs) return fd; } -int -pw_file_unlock(int fd) +int pw_file_unlock(int fd) { do_pw_lock(fd, 5, F_UNLCK); return close(fd); |