summaryrefslogtreecommitdiffstats
path: root/source/auth
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2006-06-13 01:50:55 +0000
committerGerald Carter <jerry@samba.org>2006-06-13 01:50:55 +0000
commitb41c960fbf2c2ace0ef3522ab2206cfe1c7cd542 (patch)
treedcbe181dc250400c8c14d4c51020ff3cc4d3c7b9 /source/auth
parenta8b974e74bd6adabc77e98984bc0213bdaa76d90 (diff)
downloadsamba-b41c960fbf2c2ace0ef3522ab2206cfe1c7cd542.tar.gz
samba-b41c960fbf2c2ace0ef3522ab2206cfe1c7cd542.tar.xz
samba-b41c960fbf2c2ace0ef3522ab2206cfe1c7cd542.zip
r16175: sync up with SAMBA_3_0 to release (r16156)
Diffstat (limited to 'source/auth')
-rw-r--r--source/auth/auth_util.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/source/auth/auth_util.c b/source/auth/auth_util.c
index f4d32ebdc0c..43ae5c1af65 100644
--- a/source/auth/auth_util.c
+++ b/source/auth/auth_util.c
@@ -1243,10 +1243,9 @@ NTSTATUS make_server_info_pw(auth_serversupplied_info **server_info,
}
result = make_server_info(NULL);
-
- if (!NT_STATUS_IS_OK(status)) {
+ if (result == NULL) {
TALLOC_FREE(sampass);
- return status;
+ return NT_STATUS_NO_MEMORY;
}
result->sam_account = sampass;
@@ -1279,8 +1278,7 @@ NTSTATUS make_server_info_pw(auth_serversupplied_info **server_info,
Make (and fill) a user_info struct for a guest login.
This *must* succeed for smbd to start. If there is no mapping entry for
the guest gid, then create one.
-**********************
-*****************************************************/
+***************************************************************************/
static NTSTATUS make_new_server_info_guest(auth_serversupplied_info **server_info)
{