summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/include/proto.h1
-rw-r--r--source3/passdb/ldap.c4
-rw-r--r--source3/passdb/smbpass.c3
-rw-r--r--source3/passdb/smbpassfile.c2
-rw-r--r--source3/smbd/server.c2
5 files changed, 7 insertions, 5 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 29135ec02b..e4cefae193 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -225,7 +225,6 @@ void initialize_multibyte_vectors( int client_codepage);
/*The following definitions come from ldap.c */
-BOOL ldap_open_connection(LDAP **ldap_struct);
BOOL add_ldappwd_entry(struct smb_passwd *newpwd);
BOOL mod_ldappwd_entry(struct smb_passwd *pwd, BOOL override);
BOOL add_ldap21pwd_entry(struct sam_passwd *newpwd);
diff --git a/source3/passdb/ldap.c b/source3/passdb/ldap.c
index 0804caf1a0..af595d0c0a 100644
--- a/source3/passdb/ldap.c
+++ b/source3/passdb/ldap.c
@@ -32,7 +32,7 @@ extern int DEBUGLEVEL;
/*******************************************************************
open a connection to the ldap serve.
******************************************************************/
-BOOL ldap_open_connection(LDAP **ldap_struct)
+static BOOL ldap_open_connection(LDAP **ldap_struct)
{
if ( (*ldap_struct = ldap_open(lp_ldap_server(),lp_ldap_port()) ) == NULL)
{
@@ -922,4 +922,6 @@ BOOL setldappwpos(void *vp, unsigned long tok)
return False;
}
+#else
+static void dummy_function(void) { } /* stop some compilers complaining */
#endif
diff --git a/source3/passdb/smbpass.c b/source3/passdb/smbpass.c
index a712092439..f2f0b27153 100644
--- a/source3/passdb/smbpass.c
+++ b/source3/passdb/smbpass.c
@@ -21,6 +21,7 @@
#ifdef USE_SMBPASS_DB
+extern int pw_file_lock_depth;
extern int DEBUGLEVEL;
extern pstring samlogon_user;
extern BOOL sam_logon_in_ssb;
@@ -141,7 +142,7 @@ struct sam_passwd *getsmb21pwent(void *vp)
user.smb_userid = pw_buf->smb_userid;
user.smb_grpid = pwfile->pw_gid;
- user.user_rid = uid_to_user_rid (user.smb_userid);
+ user.user_rid = pdb_uid_to_user_rid (user.smb_userid);
user.group_rid = DOMAIN_GROUP_RID_USERS; /* lkclXXXX this is OBSERVED behaviour by NT PDCs, enforced here. */
pstrcpy(full_name , "");
diff --git a/source3/passdb/smbpassfile.c b/source3/passdb/smbpassfile.c
index dfd5931a72..c9d030f529 100644
--- a/source3/passdb/smbpassfile.c
+++ b/source3/passdb/smbpassfile.c
@@ -22,6 +22,7 @@
extern int DEBUGLEVEL;
static int gotalarm;
+int pw_file_lock_depth = 0;
/***************************************************************
Signal function to tell us we timed out.
@@ -63,7 +64,6 @@ BOOL do_file_lock(int fd, int waitsecs, int type)
return (ret == 0);
}
-static int pw_file_lock_depth;
/***************************************************************
Lock an fd. Abandon after waitsecs seconds.
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 9821b305bc..a35c3a2fdc 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -5193,7 +5193,7 @@ static void usage(char *pname)
pstrcpy(global_myworkgroup, lp_workgroup());
- if(!generate_machine_sid())
+ if(!pdb_generate_machine_sid())
{
DEBUG(0,("ERROR: Samba cannot get a machine SID.\n"));
exit(1);