[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-27a-17-g9c0590c

[Michael Adam]

The branch, v3-0-test has been updated
       via  9c0590cbca8128a76300d0e5b3f5b8e479d8080f (commit)
       via  191dc2bfd22a4a4d55779281c63e4b570ac6f24b (commit)
      from  f62fe6ed60f1b9806d58c19df809ce85d596933f (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test


- Log -----------------------------------------------------------------
commit 9c0590cbca8128a76300d0e5b3f5b8e479d8080f
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Dec 10 11:47:17 2007 +0100

    Correctly unbecome_root() on error

commit 191dc2bfd22a4a4d55779281c63e4b570ac6f24b
Author: Michael Adam <obnox at samba.org>
Date:   Thu Dec 6 01:13:07 2007 +0100

    Fix a debug message (add a newline).
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 source/auth/auth_util.c |    2 ++
 source/nsswitch/idmap.c |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/auth/auth_util.c b/source/auth/auth_util.c
index 6fbec48..32224fa 100644
--- a/source/auth/auth_util.c
+++ b/source/auth/auth_util.c
@@ -956,6 +956,7 @@ static struct nt_user_token *create_local_nt_token(TALLOC_CTX *mem_ctx,
 		status = add_aliases(get_global_sam_sid(), result);
 
 		if (!NT_STATUS_IS_OK(status)) {
+			unbecome_root();
 			TALLOC_FREE(result);
 			return NULL;
 		}
@@ -965,6 +966,7 @@ static struct nt_user_token *create_local_nt_token(TALLOC_CTX *mem_ctx,
 		status = add_aliases(&global_sid_Builtin, result);
 
 		if (!NT_STATUS_IS_OK(status)) {
+			unbecome_root();
 			TALLOC_FREE(result);
 			return NULL;
 		}
diff --git a/source/nsswitch/idmap.c b/source/nsswitch/idmap.c
index 9c38f6b..676ab6e 100644
--- a/source/nsswitch/idmap.c
+++ b/source/nsswitch/idmap.c
@@ -906,7 +906,7 @@ static NTSTATUS idmap_can_map(const struct id_map *map,
 	if ( (dom = find_idmap_domain_from_sid( map->sid )) == NULL ) {
 		/* huh, couldn't find a suitable domain,
 		 *  let's just leave it unmapped */
-		DEBUG(10, ("Could not find idmap backend for SID %s",
+		DEBUG(10, ("Could not find idmap backend for SID %s\n",
 			   sid_string_static(map->sid)));
 		return NT_STATUS_NO_SUCH_DOMAIN;
 	}


-- 
Samba Shared Repository