merge from 2.2

(This used to be commit 247b9c3eba78f0ddd26d836e5e18f6630bf302c7)

diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index bc8272f97c45283e4fa60ce6455d5bd693740c7a..a3ec5900104a8822a8edcdc863865b42e8b14a28 100644 (file)
--- 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 368fb3dc49dc82e08bfeb584e3c78ba4896bacf6..5bb94c90b774b31c0b42b61b383ca338c975c397 100644 (file)
--- 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 */