summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1996-07-24 06:14:51 +0000
committerAndrew Tridgell <tridge@samba.org>1996-07-24 06:14:51 +0000
commit6b680bb89c05f4c67e78b927cab4231b647406d7 (patch)
tree7f3deb45529bf0fca138fde07fb550a81509c996 /source3
parent1924f08d8404d5e71bee93449ea9b5edd791f473 (diff)
downloadsamba-6b680bb89c05f4c67e78b927cab4231b647406d7.tar.gz
samba-6b680bb89c05f4c67e78b927cab4231b647406d7.tar.bz2
samba-6b680bb89c05f4c67e78b927cab4231b647406d7.zip
minor cleanups
(This used to be commit 7c8fd43b4e78f439406c3bb4478adf99ae17172f)
Diffstat (limited to 'source3')
-rw-r--r--source3/include/proto.h2
-rw-r--r--source3/param/params.c2
-rw-r--r--source3/passdb/smbpass.c6
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);