[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0rc2-25-gc6d6a60

[Karolin Seeger]

The branch, v3-2-stable has been updated
       via  c6d6a60f0c253ee3f9d5f6a38c3f8bb7621df0ae (commit)
       via  c1ceeb7eefe14e506c8e365836bed17ccbc05955 (commit)
       via  4a3d6be3b968d3b54edc4ee22eb9e95cc81452b8 (commit)
      from  174a6f11a9839958ce549f7ac845ddbc088a9681 (commit)

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


- Log -----------------------------------------------------------------
commit c6d6a60f0c253ee3f9d5f6a38c3f8bb7621df0ae
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jun 17 11:10:37 2008 +0200

    net_vampire: fix samsync_process_database(). Final fix for Bug #5542.
    
    Turns out the password hashes are not rid encrypted in the samsync reply.
    
    Guenther
    (cherry picked from commit 55259f408b7bc356367d872a38a54174d364fd2b)

commit c1ceeb7eefe14e506c8e365836bed17ccbc05955
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jun 17 10:36:53 2008 +0200

    net_vampire: fix build warning.
    
    Guenther
    (cherry picked from commit eb4232fec05cd87ea85a781b84a3fbe85f469703)
    (cherry picked from commit 28b85a92160c7880253725cd247e064020f8be41)

commit 4a3d6be3b968d3b54edc4ee22eb9e95cc81452b8
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jun 17 10:31:44 2008 +0200

    netapi: Fix Bug #5545 (libnetapi_init without $USER)
    
    Based on patch from Erik van Pienbroek.
    
    Guenther
    (cherry picked from commit 71f4cf773022525ba617f09c495dbff97f8eb2d5)
    (cherry picked from commit 7602a4dbfb1b2ae9963f017be62c999af0c2e043)

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

Summary of changes:
 source/lib/netapi/netapi.c     |    8 ++++++--
 source/libnet/libnet_samsync.c |    1 -
 source/utils/net_rpc_samsync.c |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/netapi/netapi.c b/source/lib/netapi/netapi.c
index 944c2c9..cf1be00 100644
--- a/source/lib/netapi/netapi.c
+++ b/source/lib/netapi/netapi.c
@@ -85,10 +85,14 @@ NET_API_STATUS libnetapi_init(struct libnetapi_ctx **context)
 		setenv(KRB5_ENV_CCNAME, ctx->krb5_cc_env, 1);
 	}
 
-	ctx->username = talloc_strdup(frame, getenv("USER"));
+	if (getenv("USER")) {
+		ctx->username = talloc_strdup(frame, getenv("USER"));
+	} else {
+		ctx->username = talloc_strdup(frame, "");
+	}
 	if (!ctx->username) {
 		TALLOC_FREE(frame);
-		fprintf(stderr, "out of memory\n");
+		fprintf(stderr, "libnetapi_init: out of memory\n");
 		return W_ERROR_V(WERR_NOMEM);
 	}
 
diff --git a/source/libnet/libnet_samsync.c b/source/libnet/libnet_samsync.c
index e45a845..61d53c3 100644
--- a/source/libnet/libnet_samsync.c
+++ b/source/libnet/libnet_samsync.c
@@ -41,7 +41,6 @@ static NTSTATUS fix_user(TALLOC_CTX *mem_ctx,
 	struct netr_DELTA_USER *user = delta->delta_union.user;
 	struct samr_Password lm_hash;
 	struct samr_Password nt_hash;
-	const char *username = user->account_name.string;
 
 	if (rid_crypt) {
 		if (user->lm_password_present) {
diff --git a/source/utils/net_rpc_samsync.c b/source/utils/net_rpc_samsync.c
index ac0739e..38852b1 100644
--- a/source/utils/net_rpc_samsync.c
+++ b/source/utils/net_rpc_samsync.c
@@ -391,7 +391,7 @@ static void dump_database(struct rpc_pipe_client *pipe_hnd,
 
 		samsync_fix_delta_array(mem_ctx,
 					&session_key,
-					true,
+					false,
 					database_id,
 					delta_enum_array);
 


-- 
Samba Shared Repository