The branch, master has been updated
       via  ff5c58da55ae359496480e66f209d9ef3e2a05cb (commit)
       via  da9f41dde201d747c50ac2f5bf7973818f168855 (commit)
      from  c6e5788435d2141f9161f3dc2ae75d1283193a25 (commit)

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


- Log -----------------------------------------------------------------
commit ff5c58da55ae359496480e66f209d9ef3e2a05cb
Author: Stefan Metzmacher <[EMAIL PROTECTED]>
Date:   Fri Nov 7 22:41:12 2008 +0100

    librpc/ndr: move ndr_sec_helper.c to the toplevel
    
    metze

commit da9f41dde201d747c50ac2f5bf7973818f168855
Author: Stefan Metzmacher <[EMAIL PROTECTED]>
Date:   Fri Nov 7 22:33:45 2008 +0100

    s4: ndr_sec_helper: remove unused include
    
    metze

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

Summary of changes:
 {source4/librpc => librpc}/ndr/ndr_sec_helper.c |    1 -
 source4/librpc/config.mk                        |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)
 rename {source4/librpc => librpc}/ndr/ndr_sec_helper.c (98%)


Changeset truncated at 500 lines:

diff --git a/source4/librpc/ndr/ndr_sec_helper.c b/librpc/ndr/ndr_sec_helper.c
similarity index 98%
rename from source4/librpc/ndr/ndr_sec_helper.c
rename to librpc/ndr/ndr_sec_helper.c
index a13c115..009e352 100644
--- a/source4/librpc/ndr/ndr_sec_helper.c
+++ b/librpc/ndr/ndr_sec_helper.c
@@ -23,7 +23,6 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "libcli/security/security.h"
 
 /*
   return the wire size of a security_ace
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 37c12d8..f9412a6 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -52,7 +52,7 @@ NDR_COMPRESSION_OBJ_FILES = ../librpc/ndr/ndr_compression.o
 PUBLIC_DEPENDENCIES = NDR_MISC LIBSECURITY
 
 NDR_SECURITY_OBJ_FILES = $(gen_ndrsrcdir)/ndr_security.o \
-                        $(ndrsrcdir)/ndr_sec_helper.o \
+                        ../librpc/ndr/ndr_sec_helper.o \
                         $(gen_ndrsrcdir)/ndr_dom_sid.o \
                         $(ndrsrcdir)/ndr_dom_sid.o
 


-- 
Samba Shared Repository

Reply via email to