summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-07-27 00:20:45 +0000
committerJeremy Allison <jra@samba.org>2003-07-27 00:20:45 +0000
commit9fc34cafa28b2fd97daaabdc38cfc4f47c5188ba (patch)
tree8935ea8ab40505b61839f8cfae671ce22a99a431
parent50548f4ddc4d0ada8d6efe892305be714c670080 (diff)
downloadsamba-9fc34cafa28b2fd97daaabdc38cfc4f47c5188ba.tar.gz
samba-9fc34cafa28b2fd97daaabdc38cfc4f47c5188ba.tar.bz2
samba-9fc34cafa28b2fd97daaabdc38cfc4f47c5188ba.zip
Ensure all code paths set add_script.
Jeremy. (This used to be commit 0021c83ff645a1923b5a3d3c484d44b20d7813f0)
-rw-r--r--source3/utils/net_rpc_samsync.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c
index dbaec007c0..9eadbbbade 100644
--- a/source3/utils/net_rpc_samsync.c
+++ b/source3/utils/net_rpc_samsync.c
@@ -400,8 +400,7 @@ sam_account_from_delta(SAM_ACCOUNT *account, SAM_ACCOUNT_INFO *delta)
return NT_STATUS_OK;
}
-static NTSTATUS
-fetch_account_info(uint32 rid, SAM_ACCOUNT_INFO *delta)
+static NTSTATUS fetch_account_info(uint32 rid, SAM_ACCOUNT_INFO *delta)
{
NTSTATUS nt_ret;
fstring account;
@@ -429,6 +428,7 @@ fetch_account_info(uint32 rid, SAM_ACCOUNT_INFO *delta)
(delta->acb_info & ACB_DOMTRUST) ) {
pstrcpy(add_script, lp_addmachine_script());
} else {
+ *add_script = '\0';
DEBUG(1, ("Unknown user type: %s\n",
smbpasswd_encode_acb_info(delta->acb_info)));
}
@@ -439,8 +439,7 @@ fetch_account_info(uint32 rid, SAM_ACCOUNT_INFO *delta)
add_ret = smbrun(add_script,NULL);
DEBUG(1,("fetch_account: Running the command `%s' "
"gave %d\n", add_script, add_ret));
- }
- else {
+ } else {
DEBUG(8,("fetch_account_info: no add user/machine script. Asking winbindd\n"));
/* don't need a RID allocated since the user already has a SID */