Author: tpot
Date: 2004-11-23 20:50:16 +0000 (Tue, 23 Nov 2004)
New Revision: 3928

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3928

Log:
Fix duplicate call to pdb_get_acct_desc().  Bugzilla #2080.

Modified:
   branches/SAMBA_3_0/source/rpc_parse/parse_samr.c
   trunk/source/rpc_parse/parse_samr.c


Changeset:
Modified: branches/SAMBA_3_0/source/rpc_parse/parse_samr.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_parse/parse_samr.c    2004-11-23 17:38:32 UTC 
(rev 3927)
+++ branches/SAMBA_3_0/source/rpc_parse/parse_samr.c    2004-11-23 20:50:16 UTC 
(rev 3928)
@@ -1666,7 +1666,7 @@
                }
                        
                init_unistr2(&sam->str[i].uni_srv_name, username, 
UNI_FLAGS_NONE);
-               init_unistr2(&sam->str[i].uni_srv_desc, pdb_get_acct_desc(pwd), 
UNI_FLAGS_NONE);
+               init_unistr2(&sam->str[i].uni_srv_desc, acct_desc, 
UNI_FLAGS_NONE);
 
                init_sam_entry2(&sam->sam[i], start_idx + i + 1,
                          &sam->str[i].uni_srv_name, &sam->str[i].uni_srv_desc,

Modified: trunk/source/rpc_parse/parse_samr.c
===================================================================
--- trunk/source/rpc_parse/parse_samr.c 2004-11-23 17:38:32 UTC (rev 3927)
+++ trunk/source/rpc_parse/parse_samr.c 2004-11-23 20:50:16 UTC (rev 3928)
@@ -1666,7 +1666,7 @@
                }
                        
                init_unistr2(&sam->str[i].uni_srv_name, username, 
UNI_FLAGS_NONE);
-               init_unistr2(&sam->str[i].uni_srv_desc, pdb_get_acct_desc(pwd), 
UNI_FLAGS_NONE);
+               init_unistr2(&sam->str[i].uni_srv_desc, acct_desc, 
UNI_FLAGS_NONE);
 
                init_sam_entry2(&sam->sam[i], start_idx + i + 1,
                          &sam->str[i].uni_srv_name, &sam->str[i].uni_srv_desc,

Reply via email to