[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  9549cf1 s3:librpc: remove unused file librpc/ndr/util.h
       via  52bc63a s3:winbindd_nrd: include ../librpc/ndr/libndr.h instead of librpc/ndr/util.h
       via  72f2bd6 s3:libads/ndr: include ../librpc/ndr/libndr.h instead of librpc/ndr/util.h
      from  0fcafbf s3: Support shadow copy display over SMB2

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 9549cf125a2e54a6bcaf4251b1f363775f8e7929
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 31 12:06:00 2011 +0200

    s3:librpc: remove unused file librpc/ndr/util.h
    
    Autobuild-User: Michael Adam <obnox at samba.org>
    Autobuild-Date: Tue May 31 15:19:46 CEST 2011 on sn-devel-104

commit 52bc63aa858318ae0f0227e2ff685a679906c72d
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 31 12:03:07 2011 +0200

    s3:winbindd_nrd: include ../librpc/ndr/libndr.h instead of librpc/ndr/util.h

commit 72f2bd6a86265de49e66d97d5ac235bc5d089669
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 31 12:03:07 2011 +0200

    s3:libads/ndr: include ../librpc/ndr/libndr.h instead of librpc/ndr/util.h

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

Summary of changes:
 source3/libads/ndr.c            |    2 +-
 source3/librpc/ndr/util.h       |    4 ----
 source3/winbindd/winbindd_ndr.c |    2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 source3/librpc/ndr/util.h


Changeset truncated at 500 lines:

diff --git a/source3/libads/ndr.c b/source3/libads/ndr.c
index c6b1121..c667aa3 100644
--- a/source3/libads/ndr.c
+++ b/source3/libads/ndr.c
@@ -22,7 +22,7 @@
 #include "includes.h"
 #include "ads.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
-#include "librpc/ndr/util.h"
+#include "../librpc/ndr/libndr.h"
 
 static void ndr_print_ads_auth_flags(struct ndr_print *ndr, const char *name, uint32_t r)
 {
diff --git a/source3/librpc/ndr/util.h b/source3/librpc/ndr/util.h
deleted file mode 100644
index 3bf9c0e..0000000
--- a/source3/librpc/ndr/util.h
+++ /dev/null
@@ -1,4 +0,0 @@
-
-/* The following definitions come from librpc/ndr/util.c  */
-
-_PUBLIC_ void ndr_print_sockaddr_storage(struct ndr_print *ndr, const char *name, const struct sockaddr_storage *ss);
diff --git a/source3/winbindd/winbindd_ndr.c b/source3/winbindd/winbindd_ndr.c
index 2f26d8d..b1fd6d7 100644
--- a/source3/winbindd/winbindd_ndr.c
+++ b/source3/winbindd/winbindd_ndr.c
@@ -21,7 +21,7 @@
 #include "winbindd.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 #include "../librpc/gen_ndr/ndr_security.h"
-#include "librpc/ndr/util.h"
+#include "../librpc/ndr/libndr.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND


-- 
Samba Shared Repository