From 1fa7300037447c6e01438509343afd2e186f066c Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 24 Oct 2011 16:50:19 +0200
Subject: [PATCH] libcli/smb: move smb_signing.[ch] to the toplevel

metze
---
 {source3/libsmb => libcli/smb}/smb_signing.c  |  1 +
 {source3/include => libcli/smb}/smb_signing.h |  0
 libcli/smb/wscript_build                      | 16 +++++++++++-----
 source3/Makefile.in                           |  2 +-
 source3/libsmb/clientgen.c                    |  2 +-
 source3/libsmb/clisigning.c                   |  2 +-
 source3/param/loadparm.c                      |  2 +-
 source3/smbd/signing.c                        |  2 +-
 source3/wscript_build                         |  1 -
 9 files changed, 17 insertions(+), 11 deletions(-)
 rename {source3/libsmb => libcli/smb}/smb_signing.c (99%)
 rename {source3/include => libcli/smb}/smb_signing.h (100%)

diff --git a/source3/libsmb/smb_signing.c b/libcli/smb/smb_signing.c
similarity index 99%
rename from source3/libsmb/smb_signing.c
rename to libcli/smb/smb_signing.c
index 1f9d36889a9..a72760b1c33 100644
--- a/source3/libsmb/smb_signing.c
+++ b/libcli/smb/smb_signing.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "../lib/crypto/md5.h"
+#include "smb_common.h"
 #include "smb_signing.h"
 
 /* Used by the SMB signing functions. */
diff --git a/source3/include/smb_signing.h b/libcli/smb/smb_signing.h
similarity index 100%
rename from source3/include/smb_signing.h
rename to libcli/smb/smb_signing.h
diff --git a/libcli/smb/wscript_build b/libcli/smb/wscript_build
index 9339b960448..8cb3e60a9f0 100644
--- a/libcli/smb/wscript_build
+++ b/libcli/smb/wscript_build
@@ -2,14 +2,20 @@
 
 
 bld.SAMBA_LIBRARY('cli_smb_common',
-	source='smb_seal.c smb2_create_blob.c smb2_signing.c util.c read_smb.c',
+	source='''
+		smb_signing.c smb_seal.c
+		smb2_create_blob.c smb2_signing.c
+		util.c read_smb.c
+	''',
 	autoproto='smb_common_proto.h',
 	deps='LIBCRYPTO errors gssapi gensec KRB5_WRAP LIBASYNC_REQ',
 	public_deps='talloc samba-util',
 	private_library=True,
-	public_headers='''smb_common.h smb2_constants.h smb_constants.h
-			smb_seal.h
-			smb2_create_blob.h smb2_signing.h smb_util.h smb_unix_ext.h
-			read_smb.h
+	public_headers='''
+		smb_common.h smb2_constants.h smb_constants.h
+		smb_signing.h smb_seal.h
+		smb2_create_blob.h smb2_signing.h
+		smb_util.h read_smb.h
+		smb_unix_ext.h
 	''',
 	)
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 6f216c67b8c..c303fe99a53 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -463,7 +463,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) $(LIBTSOCKET_OBJ) \
 	  lib/substitute.o lib/substitute_generic.o ../lib/util/substitute.o lib/dbwrap/dbwrap_util.o \
 	  lib/ms_fnmatch.o ../lib/util/ms_fnmatch.o lib/errmap_unix.o ../libcli/util/errmap_unix.o \
 	  lib/tallocmsg.o lib/dmallocmsg.o \
-	  libsmb/smb_signing.o \
+	  ../libcli/smb/smb_signing.o \
 	  ../lib/util/charset/iconv.o ../lib/util/charset/weird.o \
 	  ../lib/util/charset/charset_macosxfs.o intl/lang_tdb.o \
 	  lib/conn_tdb.o lib/adt_tree.o lib/gencache.o \
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index f5123eaf65e..117fc994ad2 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -21,7 +21,7 @@
 #include "includes.h"
 #include "libsmb/libsmb.h"
 #include "../lib/util/tevent_ntstatus.h"
-#include "smb_signing.h"
+#include "../libcli/smb/smb_signing.h"
 #include "../libcli/smb/smb_seal.h"
 #include "async_smb.h"
 
diff --git a/source3/libsmb/clisigning.c b/source3/libsmb/clisigning.c
index 4049aa0a591..2ce96c62fc3 100644
--- a/source3/libsmb/clisigning.c
+++ b/source3/libsmb/clisigning.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "libsmb/libsmb.h"
-#include "smb_signing.h"
+#include "../libcli/smb/smb_signing.h"
 
 bool cli_simple_set_signing(struct cli_state *cli,
 			    const DATA_BLOB user_session_key,
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 3ea6f66c0b4..407ef68d4ca 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -64,7 +64,7 @@
 #include "ads.h"
 #include "../librpc/gen_ndr/svcctl.h"
 #include "intl.h"
-#include "smb_signing.h"
+#include "../libcli/smb/smb_signing.h"
 #include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_rbt.h"
 #include "smbldap.h"
diff --git a/source3/smbd/signing.c b/source3/smbd/signing.c
index bdf920c91a8..8e08ae96916 100644
--- a/source3/smbd/signing.c
+++ b/source3/smbd/signing.c
@@ -22,7 +22,7 @@
 #include "includes.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
-#include "smb_signing.h"
+#include "../libcli/smb/smb_signing.h"
 
 /***********************************************************
  Called to validate an incoming packet from the client.
diff --git a/source3/wscript_build b/source3/wscript_build
index 26a1ea200fd..f2c41484583 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -66,7 +66,6 @@ LIB_SRC = '''
           lib/substitute.c lib/substitute_generic.c
           lib/ms_fnmatch.c
           lib/tallocmsg.c lib/dmallocmsg.c
-          libsmb/smb_signing.c
           intl/lang_tdb.c
           lib/conn_tdb.c lib/gencache.c
           lib/sessionid_tdb.c
-- 
2.11.4.GIT