r12801: Some more include/ cleanups (remove unused macros + move files

to specific dirs)
(This used to be commit 243cf760b077e155f5ac508aeebf819f7708a84e)

13 files changed, 19 insertions, 55 deletions

diff --git a/source4/include/debug.h b/source4/include/debug.h
index d92232c645..40d04766e1 100644
--- a/source4/include/debug.h
+++ b/source4/include/debug.h
@@ -56,6 +56,3 @@ extern int DEBUGLEVEL;
 #define DEBUGTAB(n) do_debug_tab(n)
 
 enum debug_logtype {DEBUG_STDOUT = 0, DEBUG_FILE = 1, DEBUG_STDERR = 2};
-
-/* keep some debug class defines for now to avoid changing old code too much */
-#define DBGC_AUTH 0
diff --git a/source4/include/includes.h b/source4/include/includes.h
index dd4f19009a..fae9a29a9c 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -36,6 +36,18 @@
 /** Feel free to add definitions for other compilers here. */
 #endif
 
+#ifndef PRINTF_ATTRIBUTE
+#if !defined(NO_PRINTF_ATTRIBUTE) && (__GNUC__ >= 3)
+/** Use gcc attribute to check printf fns.  a1 is the 1-based index of
+ * the parameter containing the format, and a2 the index of the first
+ * argument. Note that some gcc 2.x versions don't handle this
+ * properly **/
+#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2)))
+#else
+#define PRINTF_ATTRIBUTE(a1, a2)
+#endif
+#endif
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -79,7 +91,7 @@ struct ipv4_addr {
 
 /* Lists, trees, caching, database... */
 #include "xfile.h"
-#include "lib/talloc/talloc.h"
+#include "talloc/talloc.h"
 #include "nt_status.h"
 #include "structs.h"
 #include "trans2.h"
diff --git a/source4/lib/replace/replace.h b/source4/lib/replace/replace.h
index 0f1eb42ac0..63ec8cfd49 100644
--- a/source4/lib/replace/replace.h
+++ b/source4/lib/replace/replace.h
@@ -100,18 +100,6 @@ int vasprintf(char **ptr, const char *format, va_list ap);
 #define bzero(a,b) memset((a),'\0',(b))
 #endif
 
-#ifndef PRINTF_ATTRIBUTE
-#if !defined(NO_PRINTF_ATTRIBUTE) && (__GNUC__ >= 3)
-/** Use gcc attribute to check printf fns.  a1 is the 1-based index of
- * the parameter containing the format, and a2 the index of the first
- * argument. Note that some gcc 2.x versions don't handle this
- * properly **/
-#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2)))
-#else
-#define PRINTF_ATTRIBUTE(a1, a2)
-#endif
-#endif
-
 /* add varargs prototypes with printf checking */
 #ifndef HAVE_SNPRINTF_DECL
 int snprintf(char *,size_t ,const char *, ...) PRINTF_ATTRIBUTE(3,4);
diff --git a/source4/lib/tdr/tdr.c b/source4/lib/tdr/tdr.c
index 5ebe3f0852..cd1650e30d 100644
--- a/source4/lib/tdr/tdr.c
+++ b/source4/lib/tdr/tdr.c
@@ -41,11 +41,9 @@
 #define TDR_CVAL(tdr, ofs) CVAL(tdr->data.data,ofs)
 #define TDR_SVAL(tdr, ofs) (TDR_BE(tdr)?RSVAL(tdr->data.data,ofs):SVAL(tdr->data.data,ofs))
 #define TDR_IVAL(tdr, ofs) (TDR_BE(tdr)?RIVAL(tdr->data.data,ofs):IVAL(tdr->data.data,ofs))
-#define TDR_IVALS(tdr, ofs) (TDR_BE(tdr)?RIVALS(tdr->data.data,ofs):IVALS(tdr->data.data,ofs))
 #define TDR_SCVAL(tdr, ofs, v) SCVAL(tdr->data.data,ofs,v)
 #define TDR_SSVAL(tdr, ofs, v) do { if (TDR_BE(tdr))  { RSSVAL(tdr->data.data,ofs,v); } else SSVAL(tdr->data.data,ofs,v); } while (0)
 #define TDR_SIVAL(tdr, ofs, v) do { if (TDR_BE(tdr))  { RSIVAL(tdr->data.data,ofs,v); } else SIVAL(tdr->data.data,ofs,v); } while (0)
-#define TDR_SIVALS(tdr, ofs, v) do { if (TDR_BE(tdr))  { RSIVALS(tdr->data.data,ofs,v); } else SIVALS(tdr->data.data,ofs,v); } while (0)
 
 /*
   expand the available space in the buffer to 'size'
diff --git a/source4/include/xfile.h b/source4/lib/xfile.h
index 89fa9d1e11..89fa9d1e11 100644
--- a/source4/include/xfile.h
+++ b/source4/lib/xfile.h
diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h
index 7eb0694bd2..96a06b9bec 100644
--- a/source4/libcli/raw/libcliraw.h
+++ b/source4/libcli/raw/libcliraw.h
@@ -20,7 +20,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "request.h"
+#include "libcli/raw/request.h"
 #include "smb.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 
diff --git a/source4/include/request.h b/source4/libcli/raw/request.h
index 587adeef21..4a569cfe66 100644
--- a/source4/include/request.h
+++ b/source4/libcli/raw/request.h
@@ -21,7 +21,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "signing.h"
+#include "libcli/raw/signing.h"
 
 /*
   Shared state structure between client and server, representing the basic packet.
diff --git a/source4/include/signing.h b/source4/libcli/raw/signing.h
index dfc5a4bd7e..dfc5a4bd7e 100644
--- a/source4/include/signing.h
+++ b/source4/libcli/raw/signing.h
diff --git a/source4/main.mk b/source4/main.mk
index e4cdd816b0..c55ab07f7e 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -274,7 +274,6 @@ clean: heimdal_clean clean_pch
 	@-rm -f $(PROTO_HEADERS)
 
 distclean: clean
-	-rm -f bin/.dummy 
 	-rm -f include/config.h include/smb_build.h
 	-rm -f Makefile 
 	-rm -f config.status
@@ -311,8 +310,8 @@ gdbtest: all
 	SMBD_VALGRIND="xterm -n smbd -e gdb --args " \
 	./script/tests/selftest.sh ${selftest_prefix}/st quick SOCKET_WRAPPER
 
-bin/.dummy:
-	@: >> $@ || : > $@
+unused_macros:
+	./script/find_unused_macros.pl `find . -name "*.[ch]"` | sort
 
 ###############################################################################
 # File types
diff --git a/source4/passdb/secrets.h b/source4/passdb/secrets.h
index 429e955a8f..944a1a3e68 100644
--- a/source4/passdb/secrets.h
+++ b/source4/passdb/secrets.h
@@ -21,35 +21,6 @@
 #ifndef _SECRETS_H
 #define _SECRETS_H
 
-/* the first one is for the hashed password (NT4 style) the latter
-   for plaintext (ADS)
-*/
-#define SECRETS_MACHINE_ACCT_PASS "SECRETS/$MACHINE.ACC"
-#define SECRETS_MACHINE_PASSWORD "SECRETS/MACHINE_PASSWORD"
-
-/* this one is for storing trusted domain account password */
-#define SECRETS_DOMTRUST_ACCT_PASS "SECRETS/$DOMTRUST.ACC"
-
-/* Store the principal name used for Kerberos DES key salt under this key name. */
-#define SECRETS_SALTING_PRINCIPAL "SECRETS/SALTING_PRINCIPAL"
-
-/* The domain sid and our sid are stored here even though they aren't
-   really secret. */
-#define SECRETS_DOMAIN_SID    "SECRETS/SID"
-#define SECRETS_SAM_SID       "SAM/SID"
-
-/* The domain GUID and server GUID (NOT the same) are also not secret */
-#define SECRETS_DOMAIN_GUID   "SECRETS/DOMGUID"
-#define SECRETS_SERVER_GUID   "SECRETS/GUID"
-
-#define SECRETS_LDAP_BIND_PW "SECRETS/LDAP_BIND_PW"
-
-/* Authenticated user info is stored in secrets.tdb under these keys */
-
-#define SECRETS_AUTH_USER      "SECRETS/AUTH_USER"
-#define SECRETS_AUTH_DOMAIN      "SECRETS/AUTH_DOMAIN"
-#define SECRETS_AUTH_PASSWORD  "SECRETS/AUTH_PASSWORD"
-
 /* structure for storing machine account password
    (ie. when samba server is member of a domain */
 struct machine_acct_pass {
diff --git a/source4/smb_server/smb_server.h b/source4/smb_server/smb_server.h
index f673425dd3..b72c207e3b 100644
--- a/source4/smb_server/smb_server.h
+++ b/source4/smb_server/smb_server.h
@@ -21,7 +21,7 @@
 */
 
 #include "smb.h"
-#include "request.h"
+#include "libcli/raw/request.h"
 #include "smbd/process_model.h"
 
 /*
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index a82b899886..8e23ac244f 100644
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -21,7 +21,7 @@
 #include "includes.h"
 #include "system/time.h"
 #include "system/filesys.h"
-#include "request.h"
+#include "libcli/raw/request.h"
 #include "libcli/libcli.h"
 #include "libcli/raw/libcliraw.h"
 #include "librpc/gen_ndr/ndr_security.h"
diff --git a/source4/web_server/web_server.h b/source4/web_server/web_server.h
index 92bc673d75..f23a578206 100644
--- a/source4/web_server/web_server.h
+++ b/source4/web_server/web_server.h
@@ -18,7 +18,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "request.h"
 #include "smbd/process_model.h"
 
 /*