[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  5e0ff95 s3-epmapper: Fix adding tcpip endpoints.
       via  f97bdeb s3-auth: Fix account check over ncalrpc.
       via  15e017d s3-waf: Don't link LIBNTLMSSP twice.
      from  3dae323 s4-dsdb: fixed the defaultObjectCategory to have a full GUID

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5e0ff955ad38b9ead0b45334333bbe0572fd2bcc
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Jul 5 15:46:59 2011 +0200

    s3-epmapper: Fix adding tcpip endpoints.
    
    Autobuild-User: Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date: Wed Jul 13 15:22:11 CEST 2011 on sn-devel-104

commit f97bdebbbe29c896524e7a0a68296f2d4709364a
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Jul 12 12:23:08 2011 +0200

    s3-auth: Fix account check over ncalrpc.

commit 15e017deb02de40af1226316614386cfadb205eb
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Jul 11 18:36:44 2011 +0200

    s3-waf: Don't link LIBNTLMSSP twice.
    
    It is already linked in libsmb.

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

Summary of changes:
 source3/auth/auth.c                        |   16 ++++++++++------
 source3/auth/auth_unix.c                   |   14 +++++++++-----
 source3/rpc_server/epmapper/srv_epmapper.c |    8 ++++++++
 source3/wscript_build                      |    2 +-
 4 files changed, 28 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/auth/auth.c b/source3/auth/auth.c
index 0bdce9d..a7fe1c6 100644
--- a/source3/auth/auth.c
+++ b/source3/auth/auth.c
@@ -284,12 +284,16 @@ static NTSTATUS check_ntlm_password(const struct auth_context *auth_context,
 	if (NT_STATUS_IS_OK(nt_status)) {
 		unix_username = (*server_info)->unix_name;
 		if (!(*server_info)->guest) {
-			char *rhost;
+			const char *rhost;
 
-			rhost = tsocket_address_inet_addr_string(user_info->remote_host,
-								 talloc_tos());
-			if (rhost == NULL) {
-				return NT_STATUS_NO_MEMORY;
+			if (tsocket_address_is_inet(user_info->remote_host, "ip")) {
+				rhost = tsocket_address_inet_addr_string(user_info->remote_host,
+									 talloc_tos());
+				if (rhost == NULL) {
+					return NT_STATUS_NO_MEMORY;
+				}
+			} else {
+				rhost = "127.0.0.1";
 			}
 
 			/* We might not be root if we are an RPC call */
diff --git a/source3/auth/auth_unix.c b/source3/auth/auth_unix.c
index 6f232ec..c8b5435 100644
--- a/source3/auth/auth_unix.c
+++ b/source3/auth/auth_unix.c
@@ -39,14 +39,18 @@ static NTSTATUS check_unix_security(const struct auth_context *auth_context,
 {
 	NTSTATUS nt_status;
 	struct passwd *pass = NULL;
-	char *rhost;
+	const char *rhost;
 
 	DEBUG(10, ("Check auth for: [%s]\n", user_info->mapped.account_name));
 
-	rhost = tsocket_address_inet_addr_string(user_info->remote_host,
-						 talloc_tos());
-	if (rhost == NULL) {
-		return NT_STATUS_NO_MEMORY;
+	if (tsocket_address_is_inet(user_info->remote_host, "ip")) {
+		rhost = tsocket_address_inet_addr_string(user_info->remote_host,
+							 talloc_tos());
+		if (rhost == NULL) {
+			return NT_STATUS_NO_MEMORY;
+		}
+	} else {
+		rhost = "127.0.0.1";
 	}
 
 	become_root();
diff --git a/source3/rpc_server/epmapper/srv_epmapper.c b/source3/rpc_server/epmapper/srv_epmapper.c
index 49f2c9a..0d3ed11 100644
--- a/source3/rpc_server/epmapper/srv_epmapper.c
+++ b/source3/rpc_server/epmapper/srv_epmapper.c
@@ -142,6 +142,14 @@ static bool endpoints_match(const struct dcerpc_binding *ep1,
 		return false;
 	}
 
+	if (!ep1->host || !ep2->host) {
+		return ep1->endpoint == ep2->endpoint;
+	}
+
+	if (!strequal(ep1->host, ep2->host)) {
+		return false;
+	}
+
 	return true;
 }
 
diff --git a/source3/wscript_build b/source3/wscript_build
index 31552a0..51dc399 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -847,7 +847,7 @@ bld.SAMBA3_SUBSYSTEM('SMBLDAP',
 
 bld.SAMBA3_LIBRARY('ads',
                    source=LIBADS_SRC,
-                   deps='cli-ldap-common KRB5_WRAP ldap lber KRBCLIENT param LIBNTLMSSP LIBNMB libsmb DCUTIL',
+                   deps='cli-ldap-common KRB5_WRAP ldap lber KRBCLIENT param LIBNMB libsmb DCUTIL',
                    private_library=True,
                    vars=locals())
 


-- 
Samba Shared Repository