summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/passdb/smbpass.c2
-rw-r--r--source3/rpc_server/srv_samr.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/source3/passdb/smbpass.c b/source3/passdb/smbpass.c
index bfb3946b1a..1579a5e00d 100644
--- a/source3/passdb/smbpass.c
+++ b/source3/passdb/smbpass.c
@@ -41,7 +41,7 @@ static void *startsmbfilepwent_internal(const char *pfile, enum pwf_access_type
FILE *fp = NULL;
const char *open_mode = NULL;
int race_loop = 0;
- int lock_type;
+ int lock_type = F_RDLCK;
if (!*pfile) {
DEBUG(0, ("startsmbfilepwent: No SMB password file set\n"));
diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c
index 650fa704b8..d09ae2ad01 100644
--- a/source3/rpc_server/srv_samr.c
+++ b/source3/rpc_server/srv_samr.c
@@ -119,7 +119,6 @@ static BOOL get_sampwd_entries(SAM_USER_INFO_21 *pw_buf,
static char *unmap_unixname(char *unix_user_name, int name_idx)
{
char *mapfile = lp_username_map();
- char *s;
char **lines;
static pstring tok;
int i;
@@ -136,7 +135,7 @@ static char *unmap_unixname(char *unix_user_name, int name_idx)
DEBUG(5,("unmap_unixname: scanning username map %s, index: %d\n", mapfile, name_idx));
for (i=0; lines[i]; i++) {
- char *unixname = s;
+ char *unixname = lines[i];
char *dosname = strchr(unixname,'=');
if (!dosname)