[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-test-1592-g0b85f71
Stefan Metzmacher
metze at samba.org
Mon Jan 21 12:22:08 GMT 2008
The branch, v3-2-test has been updated
via 0b85f7173d0770f8d9a0bac9e43355eb45bc181f (commit)
via df08708fc1e8fc8e15b36db29faf35ae5ae64b65 (commit)
from 01bda3ab359fb3868c1dc849044f613bf2bc563e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 0b85f7173d0770f8d9a0bac9e43355eb45bc181f
Author: Stefan Metzmacher <metze at samba.org>
Date: Sat Jan 19 11:08:49 2008 +0100
libwbclient: use the same style in each switch case for the error mapping
metze
commit df08708fc1e8fc8e15b36db29faf35ae5ae64b65
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jan 18 08:39:47 2008 +0100
winbindd: remove useless strcpy
metze
-----------------------------------------------------------------------
Summary of changes:
source/nsswitch/libwbclient/wbclient.c | 4 ++--
source/winbindd/winbindd_pam.c | 5 +----
2 files changed, 3 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/nsswitch/libwbclient/wbclient.c b/source/nsswitch/libwbclient/wbclient.c
index 321a7db..42a9943 100644
--- a/source/nsswitch/libwbclient/wbclient.c
+++ b/source/nsswitch/libwbclient/wbclient.c
@@ -72,10 +72,10 @@ wbcErr wbcRequestResponse(int cmd,
wbc_status = WBC_ERR_SUCCESS;
break;
case NSS_STATUS_UNAVAIL:
- return WBC_ERR_WINBIND_NOT_AVAILABLE;
+ wbc_status = WBC_ERR_WINBIND_NOT_AVAILABLE;
break;
case NSS_STATUS_NOTFOUND:
- return WBC_ERR_DOMAIN_NOT_FOUND;
+ wbc_status = WBC_ERR_DOMAIN_NOT_FOUND;
break;
default:
wbc_status = WBC_ERR_NSS_ERROR;
diff --git a/source/winbindd/winbindd_pam.c b/source/winbindd/winbindd_pam.c
index 0c75cb1..98c9ae2 100644
--- a/source/winbindd/winbindd_pam.c
+++ b/source/winbindd/winbindd_pam.c
@@ -31,8 +31,6 @@ static NTSTATUS append_info3_as_txt(TALLOC_CTX *mem_ctx,
struct winbindd_cli_state *state,
NET_USER_INFO_3 *info3)
{
- fstring str_sid;
-
state->response.data.auth.info3.logon_time =
nt_time_to_unix(info3->logon_time);
state->response.data.auth.info3.logoff_time =
@@ -51,8 +49,7 @@ static NTSTATUS append_info3_as_txt(TALLOC_CTX *mem_ctx,
state->response.data.auth.info3.user_rid = info3->user_rid;
state->response.data.auth.info3.group_rid = info3->group_rid;
- sid_to_fstring(str_sid, &(info3->dom_sid.sid));
- fstrcpy(state->response.data.auth.info3.dom_sid, str_sid);
+ sid_to_fstring(state->response.data.auth.info3.dom_sid, &(info3->dom_sid.sid));
state->response.data.auth.info3.num_groups = info3->num_groups;
state->response.data.auth.info3.user_flgs = info3->user_flgs;
--
Samba Shared Repository
More information about the samba-cvs
mailing list