summaryrefslogtreecommitdiff
path: root/source3/rpc_server
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2000-05-09 13:28:19 +0000
committerAndrew Tridgell <tridge@samba.org>2000-05-09 13:28:19 +0000
commitc23e01d049cc7aee34e8ac83efeb74c09aa257a2 (patch)
tree3e18583946ecfce1474bae792f2449be5ad66139 /source3/rpc_server
parentfe7f54bc996fee425b57951cb6c167c277a45f4e (diff)
downloadsamba-c23e01d049cc7aee34e8ac83efeb74c09aa257a2.tar.gz
samba-c23e01d049cc7aee34e8ac83efeb74c09aa257a2.tar.bz2
samba-c23e01d049cc7aee34e8ac83efeb74c09aa257a2.zip
the beginnings of a new scheme I've working on to allow an easier
head/tng merge. It goes something like this: - headers from tng get copied over one at a time - the old headers get renamed to *_old.h - server side code that used the old headers gets a #define OLD_NTDOMAIN 1 #undef OLD_NTDOMAIN at the start and end of the code - mkproto.awk recognises these special defines and does magic stuff so that each .c file sees the right headers - we start moving the rpc client libraries from tng to head. if this goes OK then, in theory, we should be able to move the client side rpc code from tng to head without disturbing the existing head server side code. Then when that works we can consider merging the server side. it remains to be seen if this scheme will work. So far I've moved rpc_samr.h and don't seem to have broken anything. Note this this is still a very delicate operation, as at every step of the way I want to keep head fully functional. Please don't take part unless you discuss it with me first. (This used to be commit f76c037255a6a79d11bec65e863e009a41a4f0fd)
Diffstat (limited to 'source3/rpc_server')
-rw-r--r--source3/rpc_server/srv_pipe.c3
-rw-r--r--source3/rpc_server/srv_samr.c5
2 files changed, 8 insertions, 0 deletions
diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index 3637f68adf..581d6c04bd 100644
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -1,3 +1,4 @@
+#define OLD_NTDOMAIN 1
/*
* Unix SMB/Netbios implementation.
* Version 1.9.
@@ -1112,3 +1113,5 @@ BOOL api_rpcTNP(pipes_struct *p, char *rpc_name, struct api_struct *api_rpc_cmds
return True;
}
+
+#undef OLD_NTDOMAIN
diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c
index 08bba0eef4..650fa704b8 100644
--- a/source3/rpc_server/srv_samr.c
+++ b/source3/rpc_server/srv_samr.c
@@ -1,3 +1,5 @@
+#define OLD_NTDOMAIN 1
+
/*
* Unix SMB/Netbios implementation.
* Version 1.9.
@@ -1948,3 +1950,6 @@ BOOL api_samr_rpc(pipes_struct *p, prs_struct *data)
{
return api_rpcTNP(p, "api_samr_rpc", api_samr_cmds, data);
}
+
+#undef OLD_NTDOMAIN
+