[SCM] Samba Shared Repository - branch v3-6-test updated

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  147134d s3-winbind: no need to include ../librpc/gen_ndr/cli_lsa.h in winbindd/winbindd_msrpc.c.
       via  aeaa567 s3-rpc_client: no need to include ../librpc/gen_ndr/ndr_lsa_c.h anymore.
       via  6ca2a50 s3-netlogon: no need to include ../librpc/gen_ndr/ndr_lsa_c.h anymore.
       via  a7d51f3 s3-netlogon: no need to include ../librpc/gen_ndr/cli_samr.h anymore.
       via  1b496df s3-net: use correct spoolss header in net rpc.
       via  4ac245f s3-net: use correct spoolss header in net_ads.c.
      from  ec9c8d2 Fix error where Windows client spoolss returns WERR_INVALID_DATA       W_ERROR(0x0000000D) on opening a printer. We can't return zero for devmode->size. Guenther please check ! (cherry picked from commit e78e3e396ae812ed9e5897eb2833c51c85e49b83)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 147134d552ae92660ca80351afec7d91e75b5fd2
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jan 18 18:05:29 2011 +0100

    s3-winbind: no need to include ../librpc/gen_ndr/cli_lsa.h in
    winbindd/winbindd_msrpc.c.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Wed Jan 19 00:37:46 CET 2011 on sn-devel-104
    (cherry picked from commit 49969e6aeb6607620177146461e114820a4c002c)

commit aeaa5679fc502a5fbb23212e0e7f910748113a48
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jan 18 16:32:20 2011 +0100

    s3-rpc_client: no need to include ../librpc/gen_ndr/ndr_lsa_c.h anymore.
    
    Guenther
    (cherry picked from commit 5efe6566a0c6fb668df81eb5e524244cff442271)

commit 6ca2a508ed7e08084138b4e327bdd8f9f1b8c0cb
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jan 18 16:32:05 2011 +0100

    s3-netlogon: no need to include ../librpc/gen_ndr/ndr_lsa_c.h anymore.
    
    Guenther
    (cherry picked from commit 6feed0c9d293426c05b4b1167fd01be35844be2c)

commit a7d51f36f18cffcf950a4ebdb600879e9ff99dae
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jan 18 14:27:17 2011 +0100

    s3-netlogon: no need to include ../librpc/gen_ndr/cli_samr.h anymore.
    
    Guenther
    (cherry picked from commit 6ed4121d5400598b58521807c2caa41a4422f778)

commit 1b496df812b19a2fab27f1e45d259748053c04ec
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jan 18 22:53:59 2011 +0100

    s3-net: use correct spoolss header in net rpc.
    
    Guenther
    (cherry picked from commit 430664d7696c8265adf6ed144fdefd1e424844a1)

commit 4ac245f8256ff8bc6abb33a076def5d31c0f6aad
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jan 18 22:35:17 2011 +0100

    s3-net: use correct spoolss header in net_ads.c.
    
    Guenther
    (cherry picked from commit 66bc2f912712f74c646d6e619d73a8b6a1eb9478)

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

Summary of changes:
 source3/rpc_client/cli_lsarpc.c    |    2 +-
 source3/rpc_server/srv_netlog_nt.c |    4 ++--
 source3/utils/net_ads.c            |    2 +-
 source3/utils/net_rpc.c            |    2 +-
 source3/winbindd/winbindd_msrpc.c  |    1 -
 5 files changed, 5 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index e4a989a..36239f5 100644
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
-#include "../librpc/gen_ndr/cli_lsa.h"
+#include "../librpc/gen_ndr/ndr_lsa_c.h"
 #include "rpc_client/cli_lsarpc.h"
 #include "rpc_client/init_lsa.h"
 #include "../libcli/security/security.h"
diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c
index 487e07d..ff0f72b 100644
--- a/source3/rpc_server/srv_netlog_nt.c
+++ b/source3/rpc_server/srv_netlog_nt.c
@@ -29,8 +29,8 @@
 #include "../librpc/gen_ndr/srv_netlogon.h"
 #include "../librpc/gen_ndr/srv_samr.h"
 #include "../librpc/gen_ndr/srv_lsa.h"
-#include "../librpc/gen_ndr/cli_samr.h"
-#include "../librpc/gen_ndr/cli_lsa.h"
+#include "../librpc/gen_ndr/ndr_samr_c.h"
+#include "../librpc/gen_ndr/ndr_lsa_c.h"
 #include "rpc_client/cli_lsarpc.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "../lib/crypto/md4.h"
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index ac14184..c8b141d 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "utils/net.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
-#include "../librpc/gen_ndr/cli_spoolss.h"
+#include "../librpc/gen_ndr/ndr_spoolss.h"
 #include "nsswitch/libwbclient/wbclient.h"
 #include "ads.h"
 #include "libads/cldap.h"
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 18e6b63..388ceb8 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -30,7 +30,7 @@
 #include "rpc_client/cli_lsarpc.h"
 #include "../librpc/gen_ndr/ndr_netlogon_c.h"
 #include "../librpc/gen_ndr/ndr_srvsvc_c.h"
-#include "../librpc/gen_ndr/cli_spoolss.h"
+#include "../librpc/gen_ndr/ndr_spoolss.h"
 #include "../librpc/gen_ndr/ndr_initshutdown_c.h"
 #include "../librpc/gen_ndr/ndr_winreg_c.h"
 #include "secrets.h"
diff --git a/source3/winbindd/winbindd_msrpc.c b/source3/winbindd/winbindd_msrpc.c
index 8b2e550..dade76a 100644
--- a/source3/winbindd/winbindd_msrpc.c
+++ b/source3/winbindd/winbindd_msrpc.c
@@ -28,7 +28,6 @@
 
 #include "../librpc/gen_ndr/cli_samr.h"
 #include "rpc_client/cli_samr.h"
-#include "../librpc/gen_ndr/cli_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
 #include "../libcli/security/security.h"
 


-- 
Samba Shared Repository