summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2001-09-26 14:40:21 +0000
committerGerald Carter <jerry@samba.org>2001-09-26 14:40:21 +0000
commitc10dc7a4cc6a39d3b307b760e37764ac6dbe6103 (patch)
tree69cbc54665ebd156568698ac62bb3873593fe5ac
parent41821943daef5a4fd077e38068539ae4e24121b3 (diff)
downloadsamba-c10dc7a4cc6a39d3b307b760e37764ac6dbe6103.tar.gz
samba-c10dc7a4cc6a39d3b307b760e37764ac6dbe6103.tar.bz2
samba-c10dc7a4cc6a39d3b307b760e37764ac6dbe6103.zip
merge from 2.2
(This used to be commit 247b9c3eba78f0ddd26d836e5e18f6630bf302c7)
-rw-r--r--source3/passdb/passdb.c2
-rw-r--r--source3/passdb/pdb_nisplus.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index bc8272f97c..a3ec590010 100644
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -650,7 +650,7 @@ BOOL local_sid_to_gid(gid_t *pgid, DOM_SID *psid, enum SID_NAME_USE *name_type)
static void select_name(pstring string, const UNISTR2 *from)
{
if (from->buffer != 0)
- unistr2_to_ascii(string, from, sizeof(*string));
+ unistr2_to_ascii(string, from, sizeof(pstring));
}
/*************************************************************
diff --git a/source3/passdb/pdb_nisplus.c b/source3/passdb/pdb_nisplus.c
index 368fb3dc49..5bb94c90b7 100644
--- a/source3/passdb/pdb_nisplus.c
+++ b/source3/passdb/pdb_nisplus.c
@@ -3,7 +3,7 @@
* Copyright (C) Andrew Tridgell 1992-1998 Modified by Jeremy Allison 1995.
* Copyright (C) Benny Holmgren 1998 <bigfoot@astrakan.hgs.se>
* Copyright (C) Luke Kenneth Casson Leighton 1996-1998.
- * Copyright (C) Toomas Soomea <tsoome@ut.ee> 2001
+ * Copyright (C) Toomas Soome <tsoome@ut.ee> 2001
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free
@@ -484,6 +484,7 @@ static BOOL init_nisp_from_sam(nis_object *obj, SAM_ACCOUNT *sampass,
static fstring pwdmchg_t; /* from SAM */
static fstring full_name; /* from SAM */
static fstring acct_desc; /* from SAM */
+ static char empty[1]; /* just an empty string */
name = pdb_get_username(sampass);
@@ -764,7 +765,6 @@ static BOOL init_nisp_from_sam(nis_object *obj, SAM_ACCOUNT *sampass,
pdb_get_hours_len(sampass)-1, EN_MODIFIED);
}
} else {
- char empty[1];
char *homedir, *dirdrive, *logon_script, *profile_path, *workstations;
*empty = '\0'; /* empty string */