Merge branch 'master' of ssh://git.samba.org/data/git/samba

6 files changed, 8 insertions, 327 deletions

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 1c9c0c1204..fd753128d4 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -831,7 +831,7 @@ PDBEDIT_OBJ = utils/pdbedit.o $(PASSWD_UTIL_OBJ) $(PARAM_OBJ) $(PASSDB_OBJ) @LIB
 
 SMBGET_OBJ = utils/smbget.o $(POPT_LIB_OBJ) $(LIBSMBCLIENT_OBJ1) @LIBWBCLIENT_STATIC@
 
-DISPLAY_SEC_OBJ= lib/display_sec.o
+DISPLAY_SEC_OBJ= ../libcli/security/display_sec.o
 
 RPCCLIENT_OBJ1 = rpcclient/rpcclient.o rpcclient/cmd_lsarpc.o \
 	         rpcclient/cmd_samr.o rpcclient/cmd_spoolss.o \
diff --git a/source3/lib/display_sec.c b/source3/lib/display_sec.c
deleted file mode 100644
index fe1ae77edd..0000000000
--- a/source3/lib/display_sec.c
+++ /dev/null
@@ -1,317 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   Samba utility functions
-   Copyright (C) Andrew Tridgell 1992-1999
-   Copyright (C) Luke Kenneth Casson Leighton 1996 - 1999
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful, 
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-
-/****************************************************************************
-convert a security permissions into a string
-****************************************************************************/
-
-char *get_sec_mask_str(TALLOC_CTX *ctx, uint32 type)
-{
-	char *typestr = talloc_strdup(ctx, "");
-
-	if (!typestr) {
-		return NULL;
-	}
-
-	if (type & GENERIC_ALL_ACCESS) {
-		typestr = talloc_asprintf_append(typestr,
-				"Generic all access ");
-		if (!typestr) {
-			return NULL;
-		}
-	}
-	if (type & GENERIC_EXECUTE_ACCESS) {
-		typestr = talloc_asprintf_append(typestr,
-				"Generic execute access");
-		if (!typestr) {
-			return NULL;
-		}
-	}
-	if (type & GENERIC_WRITE_ACCESS) {
-		typestr = talloc_asprintf_append(typestr,
-				"Generic write access ");
-		if (!typestr) {
-			return NULL;
-		}
-	}
-	if (type & GENERIC_READ_ACCESS) {
-		typestr = talloc_asprintf_append(typestr,
-				"Generic read access ");
-		if (!typestr) {
-			return NULL;
-		}
-	}
-	if (type & MAXIMUM_ALLOWED_ACCESS) {
-		typestr = talloc_asprintf_append(typestr,
-				"MAXIMUM_ALLOWED_ACCESS ");
-		if (!typestr) {
-			return NULL;
-		}
-	}
-	if (type & SYSTEM_SECURITY_ACCESS) {
-		typestr = talloc_asprintf_append(typestr,
-				"SYSTEM_SECURITY_ACCESS ");
-		if (!typestr) {
-			return NULL;
-		}
-	}
-	if (type & SYNCHRONIZE_ACCESS) {
-		typestr = talloc_asprintf_append(typestr,
-				"SYNCHRONIZE_ACCESS ");
-		if (!typestr) {
-			return NULL;
-		}
-	}
-	if (type & WRITE_OWNER_ACCESS) {
-		typestr = talloc_asprintf_append(typestr,
-				"WRITE_OWNER_ACCESS ");
-		if (!typestr) {
-			return NULL;
-		}
-	}
-	if (type & WRITE_DAC_ACCESS) {
-		typestr = talloc_asprintf_append(typestr,
-				"WRITE_DAC_ACCESS ");
-		if (!typestr) {
-			return NULL;
-		}
-	}
-	if (type & READ_CONTROL_ACCESS) {
-		typestr = talloc_asprintf_append(typestr,
-				"READ_CONTROL_ACCESS ");
-		if (!typestr) {
-			return NULL;
-		}
-	}
-	if (type & DELETE_ACCESS) {
-		typestr = talloc_asprintf_append(typestr,
-				"DELETE_ACCESS ");
-		if (!typestr) {
-			return NULL;
-		}
-	}
-
-	printf("\t\tSpecific bits: 0x%lx\n", (unsigned long)type&SPECIFIC_RIGHTS_MASK);
-
-	return typestr;
-}
-
-/****************************************************************************
- display sec_access structure
- ****************************************************************************/
-void display_sec_access(uint32_t *info)
-{
-	char *mask_str = get_sec_mask_str(NULL, *info);
-	printf("\t\tPermissions: 0x%x: %s\n", *info, mask_str ? mask_str : "");
-	TALLOC_FREE(mask_str);
-}
-
-/****************************************************************************
- display sec_ace flags
- ****************************************************************************/
-void display_sec_ace_flags(uint8_t flags)
-{
-	if (flags & SEC_ACE_FLAG_OBJECT_INHERIT)
-		printf("SEC_ACE_FLAG_OBJECT_INHERIT ");
-	if (flags & SEC_ACE_FLAG_CONTAINER_INHERIT)
-		printf(" SEC_ACE_FLAG_CONTAINER_INHERIT ");
-	if (flags & SEC_ACE_FLAG_NO_PROPAGATE_INHERIT)
-		printf("SEC_ACE_FLAG_NO_PROPAGATE_INHERIT ");
-	if (flags & SEC_ACE_FLAG_INHERIT_ONLY)
-		printf("SEC_ACE_FLAG_INHERIT_ONLY ");
-	if (flags & SEC_ACE_FLAG_INHERITED_ACE)
-		printf("SEC_ACE_FLAG_INHERITED_ACE ");
-/*	if (flags & SEC_ACE_FLAG_VALID_INHERIT)
-		printf("SEC_ACE_FLAG_VALID_INHERIT "); */
-	if (flags & SEC_ACE_FLAG_SUCCESSFUL_ACCESS)
-		printf("SEC_ACE_FLAG_SUCCESSFUL_ACCESS ");
-	if (flags & SEC_ACE_FLAG_FAILED_ACCESS)
-		printf("SEC_ACE_FLAG_FAILED_ACCESS ");
-
-	printf("\n");
-}
-
-/****************************************************************************
- display sec_ace object
- ****************************************************************************/
-static void disp_sec_ace_object(struct security_ace_object *object)
-{
-	if (object->flags & SEC_ACE_OBJECT_TYPE_PRESENT) {
-		printf("Object type: SEC_ACE_OBJECT_TYPE_PRESENT\n");
-		printf("Object GUID: %s\n", GUID_string(talloc_tos(),
-			&object->type.type));
-	}
-	if (object->flags & SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT) {
-		printf("Object type: SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT\n");
-		printf("Object GUID: %s\n", GUID_string(talloc_tos(), 
-			&object->inherited_type.inherited_type));
-	}
-}
-
-/****************************************************************************
- display sec_ace structure
- ****************************************************************************/
-void display_sec_ace(SEC_ACE *ace)
-{
-	fstring sid_str;
-
-	printf("\tACE\n\t\ttype: ");
-	switch (ace->type) {
-		case SEC_ACE_TYPE_ACCESS_ALLOWED:
-			printf("ACCESS ALLOWED");
-			break;
-		case SEC_ACE_TYPE_ACCESS_DENIED:
-			printf("ACCESS DENIED");
-			break;
-		case SEC_ACE_TYPE_SYSTEM_AUDIT:
-			printf("SYSTEM AUDIT");
-			break;
-		case SEC_ACE_TYPE_SYSTEM_ALARM:
-			printf("SYSTEM ALARM");
-			break;
-		case SEC_ACE_TYPE_ALLOWED_COMPOUND:
-			printf("SEC_ACE_TYPE_ALLOWED_COMPOUND");
-			break;
-		case SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT:
-			printf("SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT");
-			break;
-		case SEC_ACE_TYPE_ACCESS_DENIED_OBJECT:
-			printf("SEC_ACE_TYPE_ACCESS_DENIED_OBJECT");
-			break;
-		case SEC_ACE_TYPE_SYSTEM_AUDIT_OBJECT:
-			printf("SEC_ACE_TYPE_SYSTEM_AUDIT_OBJECT");
-			break;
-		case SEC_ACE_TYPE_SYSTEM_ALARM_OBJECT:
-			printf("SEC_ACE_TYPE_SYSTEM_ALARM_OBJECT");
-			break;
-		default:
-			printf("????");
-			break;
-	}
-
-	printf(" (%d) flags: 0x%02x ", ace->type, ace->flags);
-	display_sec_ace_flags(ace->flags);
-	display_sec_access(&ace->access_mask);
-	sid_to_fstring(sid_str, &ace->trustee);
-	printf("\t\tSID: %s\n\n", sid_str);
-
-	if (sec_ace_object(ace->type)) {
-		disp_sec_ace_object(&ace->object.object);
-	}
-
-}
-
-/****************************************************************************
- display sec_acl structure
- ****************************************************************************/
-void display_sec_acl(SEC_ACL *sec_acl)
-{
-	int i;
-
-	printf("\tACL\tNum ACEs:\t%d\trevision:\t%x\n",
-			 sec_acl->num_aces, sec_acl->revision); 
-	printf("\t---\n");
-
-	if (sec_acl->size != 0 && sec_acl->num_aces != 0) {
-		for (i = 0; i < sec_acl->num_aces; i++) {
-			display_sec_ace(&sec_acl->aces[i]);
-		}
-	}
-}
-
-void display_acl_type(uint16 type)
-{
-	fstring typestr="";
-
-	typestr[0] = 0;
-
-	if (type & SEC_DESC_OWNER_DEFAULTED)	/* 0x0001 */
-		fstrcat(typestr, "SEC_DESC_OWNER_DEFAULTED ");
-	if (type & SEC_DESC_GROUP_DEFAULTED)	/* 0x0002 */
-		fstrcat(typestr, "SEC_DESC_GROUP_DEFAULTED ");
-	if (type & SEC_DESC_DACL_PRESENT) 	/* 0x0004 */
-		fstrcat(typestr, "SEC_DESC_DACL_PRESENT ");
-	if (type & SEC_DESC_DACL_DEFAULTED)	/* 0x0008 */
-		fstrcat(typestr, "SEC_DESC_DACL_DEFAULTED ");
-	if (type & SEC_DESC_SACL_PRESENT)	/* 0x0010 */
-		fstrcat(typestr, "SEC_DESC_SACL_PRESENT ");
-	if (type & SEC_DESC_SACL_DEFAULTED)	/* 0x0020 */
-		fstrcat(typestr, "SEC_DESC_SACL_DEFAULTED ");
-	if (type & SEC_DESC_DACL_TRUSTED)	/* 0x0040 */
-		fstrcat(typestr, "SEC_DESC_DACL_TRUSTED ");
-	if (type & SEC_DESC_SERVER_SECURITY)	/* 0x0080 */
-		fstrcat(typestr, "SEC_DESC_SERVER_SECURITY ");
-	if (type & SEC_DESC_DACL_AUTO_INHERIT_REQ) /* 0x0100 */
-		fstrcat(typestr, "SEC_DESC_DACL_AUTO_INHERIT_REQ ");
-	if (type & SEC_DESC_SACL_AUTO_INHERIT_REQ) /* 0x0200 */
-		fstrcat(typestr, "SEC_DESC_SACL_AUTO_INHERIT_REQ ");
-	if (type & SEC_DESC_DACL_AUTO_INHERITED) /* 0x0400 */
-		fstrcat(typestr, "SEC_DESC_DACL_AUTO_INHERITED ");
-	if (type & SEC_DESC_SACL_AUTO_INHERITED) /* 0x0800 */
-		fstrcat(typestr, "SEC_DESC_SACL_AUTO_INHERITED ");
-	if (type & SEC_DESC_DACL_PROTECTED)	/* 0x1000 */
-		fstrcat(typestr, "SEC_DESC_DACL_PROTECTED ");
-	if (type & SEC_DESC_SACL_PROTECTED)	/* 0x2000 */
-		fstrcat(typestr, "SEC_DESC_SACL_PROTECTED ");
-	if (type & SEC_DESC_RM_CONTROL_VALID)	/* 0x4000 */
-		fstrcat(typestr, "SEC_DESC_RM_CONTROL_VALID ");
-	if (type & SEC_DESC_SELF_RELATIVE)	/* 0x8000 */
-		fstrcat(typestr, "SEC_DESC_SELF_RELATIVE ");
-	
-	printf("type: 0x%04x: %s\n", type, typestr);
-}
-
-/****************************************************************************
- display sec_desc structure
- ****************************************************************************/
-void display_sec_desc(SEC_DESC *sec)
-{
-	fstring sid_str;
-
-	if (!sec) {
-		printf("NULL\n");
-		return;
-	}
-
-	printf("revision: %d\n", sec->revision);
-	display_acl_type(sec->type);
-
-	if (sec->sacl) {
-		printf("SACL\n");
-		display_sec_acl(sec->sacl);
-	}
-
-	if (sec->dacl) {
-		printf("DACL\n");
-		display_sec_acl(sec->dacl);
-	}
-
-	if (sec->owner_sid) {
-		sid_to_fstring(sid_str, sec->owner_sid);
-		printf("\tOwner SID:\t%s\n", sid_str);
-	}
-
-	if (sec->group_sid) {
-		sid_to_fstring(sid_str, sec->group_sid);
-		printf("\tGroup SID:\t%s\n", sid_str);
-	}
-}
diff --git a/source3/lib/util_file.c b/source3/lib/util_file.c
index c5a9b7c29a..50ff844762 100644
--- a/source3/lib/util_file.c
+++ b/source3/lib/util_file.c
@@ -39,7 +39,7 @@ static char *file_pload(const char *syscmd, size_t *size)
 	total = 0;
 
 	while ((n = read(fd, buf, sizeof(buf))) > 0) {
-		p = (char *)SMB_REALLOC(p, total + n + 1);
+		p = talloc_realloc(NULL, p, char, total + n + 1);
 		if (!p) {
 		        DEBUG(0,("file_pload: failed to expand buffer!\n"));
 			close(fd);
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index bafb89522a..70841225a7 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -887,7 +887,8 @@ struct share_mode_lock *fetch_share_mode_unlocked(TALLOC_CTX *mem_ctx,
 	}
 
 	if (!fill_share_mode_lock(lck, id, servicepath, fname, data, NULL)) {
-		DEBUG(3, ("fill_share_mode_lock failed\n"));
+		DEBUG(10, ("fetch_share_mode_unlocked: no share_mode record "
+			   "around (file not open)\n"));
 		TALLOC_FREE(lck);
 		return NULL;
 	}
diff --git a/source3/nmbd/nmbd_elections.c b/source3/nmbd/nmbd_elections.c
index b50d215b91..1ed64f4059 100644
--- a/source3/nmbd/nmbd_elections.c
+++ b/source3/nmbd/nmbd_elections.c
@@ -130,9 +130,6 @@ void check_master_browser_exists(time_t t)
 	struct subnet_record *subrec;
 	const char *workgroup_name = lp_workgroup();
 
-	if (!lastrun)
-		lastrun = t;
-
 	if (t < (lastrun + (CHECK_TIME_MST_BROWSE * 60)))
 		return;
 
diff --git a/source3/samba4.m4 b/source3/samba4.m4
index b5c7c74689..568283cd87 100644
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -69,14 +69,14 @@ AC_CONFIG_FILES(../source4/librpc/dcerpc_atsvc.pc)
 
 m4_include(../source4/min_versions.m4)
 
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= $TALLOC_MIN_VERSION,
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= TALLOC_MIN_VERSION,
 	[],
 	[
 		SMB_INCLUDE_MK(../lib/talloc/config.mk)
 	]
 )
 
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= $TDB_MIN_VERSION,
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= TDB_MIN_VERSION,
 	[],
 	[
 		m4_include(../lib/tdb/libtdb.m4)
@@ -86,13 +86,13 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= $TDB_MIN_VERSION,
 
 SMB_INCLUDE_MK(../lib/tdb/python.mk) 
 
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBTEVENT, tevent = $TEVENT_REQUIRED_VERSION,
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBTEVENT, tevent = TEVENT_REQUIRED_VERSION,
 	[],[m4_include(../lib/tevent/samba.m4)]
 )
 
 SMB_INCLUDE_MK(../lib/tevent/python.mk) 
 
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = $LDB_REQUIRED_VERSION,
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = LDB_REQUIRED_VERSION,
 	[
 		SMB_INCLUDE_MK(lib/ldb/ldb_ildap/config.mk)
 		SMB_INCLUDE_MK(lib/ldb/tools/config.mk)