[SCM] Samba Shared Repository - branch master updated -
cc6227d0bc94192675475d174f1de19797b0409b
Jelmer Vernooij
jelmer at samba.org
Sun Oct 12 17:07:53 GMT 2008
The branch, master has been updated
via cc6227d0bc94192675475d174f1de19797b0409b (commit)
via 9f2ed1e00f586a67ab2d8c1f4770a570e6ae9740 (commit)
from edff62a31ebe818c62de21878359be8477d77a2f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit cc6227d0bc94192675475d174f1de19797b0409b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Oct 12 19:06:00 2008 +0200
Ignore generated but unused files.
commit 9f2ed1e00f586a67ab2d8c1f4770a570e6ae9740
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Oct 12 19:05:46 2008 +0200
Share RPC binding string utility functions.
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 4 +
{source4/librpc => librpc}/rpc/binding.c | 6 +-
pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm | 2 +-
source3/Makefile.in | 2 +-
source3/include/proto.h | 2 +-
source3/librpc/gen_ndr/srv_dfs.c | 46 +-
source3/librpc/gen_ndr/srv_dssetup.c | 22 +-
source3/librpc/gen_ndr/srv_echo.c | 20 +-
source3/librpc/gen_ndr/srv_epmapper.c | 16 +-
source3/librpc/gen_ndr/srv_eventlog.c | 48 +-
source3/librpc/gen_ndr/srv_initshutdown.c | 6 +-
source3/librpc/gen_ndr/srv_lsa.c | 164 ++++----
source3/librpc/gen_ndr/srv_netlogon.c | 94 ++--
source3/librpc/gen_ndr/srv_ntsvcs.c | 130 +++---
source3/librpc/gen_ndr/srv_samr.c | 136 +++---
source3/librpc/gen_ndr/srv_srvsvc.c | 108 +++---
source3/librpc/gen_ndr/srv_svcctl.c | 88 ++--
source3/librpc/gen_ndr/srv_winreg.c | 70 ++--
source3/librpc/gen_ndr/srv_wkssvc.c | 62 ++--
source3/librpc/ndr/ndr.c | 12 +-
source3/librpc/ndr/ndr_compression.c | 6 +-
source3/librpc/rpc/binding.c | 709 -----------------------------
source3/librpc/rpc/dcerpc.c | 2 +-
source3/librpc/rpc/dcerpc.h | 48 ++
source3/rpc_client/ndr.c | 2 +-
source4/librpc/config.mk | 5 +-
26 files changed, 577 insertions(+), 1233 deletions(-)
rename {source4/librpc => librpc}/rpc/binding.c (99%)
delete mode 100644 source3/librpc/rpc/binding.c
Changeset truncated at 500 lines:
diff --git a/.gitignore b/.gitignore
index 27ee256..b61bf4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -307,3 +307,7 @@ tags
packaging/RHEL-CTDB/samba.spec
packaging/RHEL/samba.spec
packaging/RHEL/makerpms.sh
+source3/librpc/gen_ndr/cli_drsblobs.c
+source3/librpc/gen_ndr/cli_drsblobs.h
+source3/librpc/gen_ndr/srv_drsblobs.c
+source3/librpc/gen_ndr/srv_drsblobs.h
diff --git a/source4/librpc/rpc/binding.c b/librpc/rpc/binding.c
similarity index 99%
rename from source4/librpc/rpc/binding.c
rename to librpc/rpc/binding.c
index bfe62c4..b755431 100644
--- a/source4/librpc/rpc/binding.c
+++ b/librpc/rpc/binding.c
@@ -23,10 +23,10 @@
*/
#include "includes.h"
-#include "lib/events/events.h"
-#include "librpc/gen_ndr/ndr_epmapper_c.h"
-#include "librpc/gen_ndr/ndr_dcerpc.h"
+#include "librpc/gen_ndr/ndr_epmapper.h"
#include "librpc/gen_ndr/ndr_misc.h"
+#include "librpc/rpc/dcerpc.h"
+#undef strcasecmp
#define MAX_PROTSEQ 10
diff --git a/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
index c565d8a..6034fb6 100644
--- a/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
+++ b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
@@ -171,7 +171,7 @@ sub ParseFunction($$)
pidl "\tNDR_PRINT_OUT_DEBUG($fn->{NAME}, r);";
pidl "}";
pidl "";
- pidl "push = ndr_push_init_ctx(r);";
+ pidl "push = ndr_push_init_ctx(r, NULL);";
pidl "if (push == NULL) {";
pidl "\ttalloc_free(r);";
pidl "\treturn false;";
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 3297278..846d1e0 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -433,7 +433,7 @@ LIBMSRPC_OBJ = rpc_client/cli_lsarpc.o rpc_client/cli_samr.o \
rpc_client/cli_svcctl.o \
rpc_client/init_samr.o \
librpc/rpc/dcerpc.o \
- librpc/rpc/binding.o
+ ../librpc/rpc/binding.o
LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_lsa.o \
librpc/gen_ndr/cli_dfs.o \
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 0a5c401..cc931ff 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -3760,7 +3760,7 @@ _PUBLIC_ struct ndr_pull *ndr_pull_init_blob(const DATA_BLOB *blob, TALLOC_CTX *
_PUBLIC_ enum ndr_err_code ndr_pull_advance(struct ndr_pull *ndr, uint32_t size);
_PUBLIC_ void ndr_pull_save(struct ndr_pull *ndr, struct ndr_pull_save *save);
_PUBLIC_ void ndr_pull_restore(struct ndr_pull *ndr, struct ndr_pull_save *save);
-_PUBLIC_ struct ndr_push *ndr_push_init_ctx(TALLOC_CTX *mem_ctx);
+_PUBLIC_ struct ndr_push *ndr_push_init_ctx(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience);
_PUBLIC_ DATA_BLOB ndr_push_blob(struct ndr_push *ndr);
_PUBLIC_ enum ndr_err_code ndr_push_expand(struct ndr_push *ndr, uint32_t extra_size);
_PUBLIC_ void ndr_print_debug_helper(struct ndr_print *ndr, const char *format, ...) _PRINTF_ATTRIBUTE(2,3);
diff --git a/source3/librpc/gen_ndr/srv_dfs.c b/source3/librpc/gen_ndr/srv_dfs.c
index 631bd82..d582720 100644
--- a/source3/librpc/gen_ndr/srv_dfs.c
+++ b/source3/librpc/gen_ndr/srv_dfs.c
@@ -63,7 +63,7 @@ static bool api_dfs_GetManagerVersion(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dfs_GetManagerVersion, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -136,7 +136,7 @@ static bool api_dfs_Add(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dfs_Add, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -209,7 +209,7 @@ static bool api_dfs_Remove(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dfs_Remove, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -282,7 +282,7 @@ static bool api_dfs_SetInfo(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dfs_SetInfo, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -362,7 +362,7 @@ static bool api_dfs_GetInfo(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dfs_GetInfo, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -438,7 +438,7 @@ static bool api_dfs_Enum(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dfs_Enum, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -511,7 +511,7 @@ static bool api_dfs_Rename(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dfs_Rename, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -584,7 +584,7 @@ static bool api_dfs_Move(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dfs_Move, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -657,7 +657,7 @@ static bool api_dfs_ManagerGetConfigInfo(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dfs_ManagerGetConfigInfo, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -730,7 +730,7 @@ static bool api_dfs_ManagerSendSiteInfo(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dfs_ManagerSendSiteInfo, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -805,7 +805,7 @@ static bool api_dfs_AddFtRoot(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dfs_AddFtRoot, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -880,7 +880,7 @@ static bool api_dfs_RemoveFtRoot(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dfs_RemoveFtRoot, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -953,7 +953,7 @@ static bool api_dfs_AddStdRoot(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dfs_AddStdRoot, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -1026,7 +1026,7 @@ static bool api_dfs_RemoveStdRoot(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dfs_RemoveStdRoot, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -1099,7 +1099,7 @@ static bool api_dfs_ManagerInitialize(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dfs_ManagerInitialize, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -1172,7 +1172,7 @@ static bool api_dfs_AddStdRootForced(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dfs_AddStdRootForced, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -1249,7 +1249,7 @@ static bool api_dfs_GetDcAddress(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dfs_GetDcAddress, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -1322,7 +1322,7 @@ static bool api_dfs_SetDcAddress(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dfs_SetDcAddress, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -1395,7 +1395,7 @@ static bool api_dfs_FlushFtTable(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dfs_FlushFtTable, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -1468,7 +1468,7 @@ static bool api_dfs_Add2(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dfs_Add2, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -1541,7 +1541,7 @@ static bool api_dfs_Remove2(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dfs_Remove2, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -1617,7 +1617,7 @@ static bool api_dfs_EnumEx(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dfs_EnumEx, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -1690,7 +1690,7 @@ static bool api_dfs_SetInfo2(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dfs_SetInfo2, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
diff --git a/source3/librpc/gen_ndr/srv_dssetup.c b/source3/librpc/gen_ndr/srv_dssetup.c
index 2dca1c8..62123b8 100644
--- a/source3/librpc/gen_ndr/srv_dssetup.c
+++ b/source3/librpc/gen_ndr/srv_dssetup.c
@@ -63,7 +63,7 @@ static bool api_dssetup_DsRoleGetPrimaryDomainInformation(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dssetup_DsRoleGetPrimaryDomainInformation, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -136,7 +136,7 @@ static bool api_dssetup_DsRoleDnsNameToFlatName(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dssetup_DsRoleDnsNameToFlatName, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -209,7 +209,7 @@ static bool api_dssetup_DsRoleDcAsDc(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dssetup_DsRoleDcAsDc, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -282,7 +282,7 @@ static bool api_dssetup_DsRoleDcAsReplica(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dssetup_DsRoleDcAsReplica, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -355,7 +355,7 @@ static bool api_dssetup_DsRoleDemoteDc(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dssetup_DsRoleDemoteDc, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -428,7 +428,7 @@ static bool api_dssetup_DsRoleGetDcOperationProgress(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dssetup_DsRoleGetDcOperationProgress, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -501,7 +501,7 @@ static bool api_dssetup_DsRoleGetDcOperationResults(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dssetup_DsRoleGetDcOperationResults, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -574,7 +574,7 @@ static bool api_dssetup_DsRoleCancel(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dssetup_DsRoleCancel, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -647,7 +647,7 @@ static bool api_dssetup_DsRoleServerSaveStateForUpgrade(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dssetup_DsRoleServerSaveStateForUpgrade, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -720,7 +720,7 @@ static bool api_dssetup_DsRoleUpgradeDownlevelServer(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dssetup_DsRoleUpgradeDownlevelServer, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -793,7 +793,7 @@ static bool api_dssetup_DsRoleAbortDownlevelServerUpgrade(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(dssetup_DsRoleAbortDownlevelServerUpgrade, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
diff --git a/source3/librpc/gen_ndr/srv_echo.c b/source3/librpc/gen_ndr/srv_echo.c
index 38e9e19..970398d 100644
--- a/source3/librpc/gen_ndr/srv_echo.c
+++ b/source3/librpc/gen_ndr/srv_echo.c
@@ -63,7 +63,7 @@ static bool api_echo_AddOne(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(echo_AddOne, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -143,7 +143,7 @@ static bool api_echo_EchoData(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(echo_EchoData, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -216,7 +216,7 @@ static bool api_echo_SinkData(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(echo_SinkData, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -296,7 +296,7 @@ static bool api_echo_SourceData(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(echo_SourceData, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -376,7 +376,7 @@ static bool api_echo_TestCall(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(echo_TestCall, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -456,7 +456,7 @@ static bool api_echo_TestCall2(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(echo_TestCall2, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -529,7 +529,7 @@ static bool api_echo_TestSleep(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(echo_TestSleep, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -606,7 +606,7 @@ static bool api_echo_TestEnum(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(echo_TestEnum, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -681,7 +681,7 @@ static bool api_echo_TestSurrounding(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(echo_TestSurrounding, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -754,7 +754,7 @@ static bool api_echo_TestDoublePointer(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(echo_TestDoublePointer, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
diff --git a/source3/librpc/gen_ndr/srv_epmapper.c b/source3/librpc/gen_ndr/srv_epmapper.c
index 69a47b3..a31d89b 100644
--- a/source3/librpc/gen_ndr/srv_epmapper.c
+++ b/source3/librpc/gen_ndr/srv_epmapper.c
@@ -56,7 +56,7 @@ static bool api_epm_Insert(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(epm_Insert, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
@@ -129,7 +129,7 @@ static bool api_epm_Delete(pipes_struct *p)
NDR_PRINT_OUT_DEBUG(epm_Delete, r);
}
- push = ndr_push_init_ctx(r);
+ push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
--
Samba Shared Repository
More information about the samba-cvs
mailing list