[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-700-g02f5f35

[Günther Deschner]

The branch, v3-2-test has been updated
       via  02f5f35e5ed3b061cfd020d0b13014c72fced5f4 (commit)
       via  aae4d91e726ef8dcad173cdd1d6f719d94462948 (commit)
      from  9cfce2229508c2145c3527074ac76520544e5d25 (commit)

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


- Log -----------------------------------------------------------------
commit 02f5f35e5ed3b061cfd020d0b13014c72fced5f4
Author: Günther Deschner <gd at samba.org>
Date:   Tue Apr 8 21:41:16 2008 +0200

    Fix the build of reply_setattrE().
    
    How ever could this compile ?
    
    Guenther

commit aae4d91e726ef8dcad173cdd1d6f719d94462948
Author: Günther Deschner <gd at samba.org>
Date:   Tue Apr 8 19:54:57 2008 +0200

    Move is_valid_policy_hnd() out of net.
    
    Guenther

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

Summary of changes:
 source/lib/util.c       |    8 ++++++++
 source/smbd/reply.c     |    4 ++--
 source/utils/net_util.c |    7 -------
 3 files changed, 10 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/util.c b/source/lib/util.c
index 00062b8..b52cc69 100644
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -3367,3 +3367,11 @@ NTSTATUS split_ntfs_stream_name(TALLOC_CTX *mem_ctx, const char *fname,
 	}
 	return NT_STATUS_OK;
 }
+
+bool is_valid_policy_hnd(const POLICY_HND *hnd)
+{
+	POLICY_HND tmp;
+	ZERO_STRUCT(tmp);
+	return (memcmp(&tmp, hnd, sizeof(tmp)) != 0);
+}
+
diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index ab77de0..2506ff9 100644
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -7029,7 +7029,7 @@ void reply_setattrE(struct smb_request *req)
 	} else {
 		if (SMB_VFS_STAT(conn, fsp->fsp_name, &sbuf) == -1) {
 			status = map_nt_error_from_unix(errno);
-			reply_nterror(req, status)
+			reply_nterror(req, status);
 			END_PROFILE(SMBsetattrE);
 			return;
 		}
@@ -7038,7 +7038,7 @@ void reply_setattrE(struct smb_request *req)
 	status = smb_set_file_time(conn, fsp, fsp->fsp_name,
 				   &sbuf, ts, true);
 	if (!NT_STATUS_IS_OK(status)) {
-		reply_doserror(req, ERRDOS, ERRnoaccess)
+		reply_doserror(req, ERRDOS, ERRnoaccess);
 		END_PROFILE(SMBsetattrE);
 		return;
 	}
diff --git a/source/utils/net_util.c b/source/utils/net_util.c
index c08eae3..f844992 100644
--- a/source/utils/net_util.c
+++ b/source/utils/net_util.c
@@ -21,13 +21,6 @@
 #include "includes.h"
 #include "utils/net.h"
 
-bool is_valid_policy_hnd(const POLICY_HND *hnd)
-{
-	POLICY_HND tmp;
-	ZERO_STRUCT(tmp);
-	return (memcmp(&tmp, hnd, sizeof(tmp)) != 0);
-}
-
 NTSTATUS net_rpc_lookup_name(TALLOC_CTX *mem_ctx, struct cli_state *cli,
 			     const char *name, const char **ret_domain,
 			     const char **ret_name, DOM_SID *ret_sid,


-- 
Samba Shared Repository