r18229: regenerated unixinfo files and add a few header stubs. Almost autogenerated now

(This used to be commit b860685a8117c3876158ac7b8db63cda9b415239)

7 files changed, 29 insertions, 10 deletions

diff --git a/source3/librpc/gen_ndr/ndr_misc.h b/source3/librpc/gen_ndr/ndr_misc.h
new file mode 100644
index 00000000000..d43a7d8b4a7
--- /dev/null
+++ b/source3/librpc/gen_ndr/ndr_misc.h
@@ -0,0 +1 @@
+#include "ndr/ndr_misc.h"
diff --git a/source3/librpc/gen_ndr/ndr_security.h b/source3/librpc/gen_ndr/ndr_security.h
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/source3/librpc/gen_ndr/ndr_security.h
diff --git a/source3/librpc/gen_ndr/ndr_unixinfo.c b/source3/librpc/gen_ndr/ndr_unixinfo.c
index d2ad824e0aa..b26cc339bbf 100644
--- a/source3/librpc/gen_ndr/ndr_unixinfo.c
+++ b/source3/librpc/gen_ndr/ndr_unixinfo.c
@@ -6,15 +6,16 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+
 #include <stdarg.h>
 #include <string.h>
 #include <core/nterr.h>
-#include <ndr/ndr_misc.h>
-#include <ndr/ndr_dcerpc.h>
-#include "gen_ndr/ndr_unixinfo.h"
+#include <gen_ndr/ndr_misc.h>
+#include <gen_ndr/ndr_dcerpc.h>
+#include "librpc/gen_ndr/ndr_unixinfo.h"
 #include <dcerpc.h>
 
-#include <ndr/ndr_security.h>
+#include <gen_ndr/ndr_security.h>
 NTSTATUS ndr_push_unixinfo_GetPWUidInfo(struct ndr_push *ndr, int ndr_flags, const struct unixinfo_GetPWUidInfo *r)
 {
 	if (ndr_flags & NDR_SCALARS) {
@@ -514,4 +515,3 @@ void ndr_print_unixinfo_GetPWUid(struct ndr_print *ndr, const char *name, int fl
 	ndr->depth--;
 }
 
-
diff --git a/source3/librpc/gen_ndr/ndr_unixinfo.h b/source3/librpc/gen_ndr/ndr_unixinfo.h
index 899a903e086..d98ff9f15da 100644
--- a/source3/librpc/gen_ndr/ndr_unixinfo.h
+++ b/source3/librpc/gen_ndr/ndr_unixinfo.h
@@ -1,6 +1,6 @@
 /* header auto-generated by pidl */
 
-#include "gen_ndr/unixinfo.h"
+#include "librpc/gen_ndr/unixinfo.h"
 
 #ifndef _HEADER_NDR_unixinfo
 #define _HEADER_NDR_unixinfo
diff --git a/source3/librpc/gen_ndr/security.h b/source3/librpc/gen_ndr/security.h
new file mode 100644
index 00000000000..1c51af5b9ca
--- /dev/null
+++ b/source3/librpc/gen_ndr/security.h
@@ -0,0 +1 @@
+#include "ndr/security.h"
diff --git a/source3/librpc/gen_ndr/unixinfo.h b/source3/librpc/gen_ndr/unixinfo.h
index 73e1c8fd6cf..e5a0471ad55 100644
--- a/source3/librpc/gen_ndr/unixinfo.h
+++ b/source3/librpc/gen_ndr/unixinfo.h
@@ -5,7 +5,7 @@
 #ifndef _HEADER_unixinfo
 #define _HEADER_unixinfo
 
-#include "librpc/ndr/security.h"
+#include "librpc/gen_ndr/security.h"
 struct unixinfo_GetPWUidInfo {
 	NTSTATUS status;/* [keepref] */
 	const char *homedir;/* [unique,keepref,charset(UTF8)] */
diff --git a/source3/script/build_idl.sh b/source3/script/build_idl.sh
index 62941f4bc53..aeea78be36f 100644
--- a/source3/script/build_idl.sh
+++ b/source3/script/build_idl.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PIDL_ARGS="--outputdir ${srcdir}/librpc/gen_ndr --header --ndr-parser --"
+PIDL_ARGS="--outputdir librpc/gen_ndr --header --ndr-parser --"
 PIDL_EXTRA_ARGS="$*"
 
 oldpwd=`pwd`
@@ -10,12 +10,16 @@ cd ${srcdir}
 
 PIDL="$PERL pidl/pidl ${PIDL_ARGS} ${PIDL_EXTRA_ARGS}"
 
+##
+## Find newer files rather than rebuild all of them
+##
+
 list=""
 for f in ${IDL_FILES}; do
 	basename=`basename $f .idl`
 	ndr="librpc/gen_ndr/ndr_$basename.c"
 
-	if [ -f $ndr ]; then
+	if [ -f $ndr && 0 ]; then
 		if [ "x`find librpc/idl/$f -newer $ndr -print`" = "xlibrpc/idl/$f" ]; then
 			list="$list librpc/idl/$f"
 		fi
@@ -24,12 +28,24 @@ for f in ${IDL_FILES}; do
 	fi
 done
 
+##
+## generate the ndr stubs
+##
+
 if [ "x$list" != x ]; then
+	echo "${PIDL} ${list}"
 	$PIDL $list || exit 1
 fi
 
+##
+## Do miscellaneous cleanup
+##
+
 for f in librpc/gen_ndr/ndr_*.c; do
-	cat $f | sed 's/^static //g' | sed 's/^_PUBLIC_ //g' > $f.new
+	cat $f | sed -e 's/^static //g' \
+		-e 's/^_PUBLIC_ //g' \
+		-e 's/#include <stdint.h>//g' \
+		-e 's/#include <stdbool.h>//g' > $f.new
 	/bin/mv -f $f.new $f
 done
 
@@ -38,3 +54,4 @@ touch librpc/gen_ndr/ndr_dcerpc.h
 cd ${oldpwd}
 
 exit 0
+