From d8e454664a97385d798ad53633856044f928a491 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 29 May 2007 15:27:13 +0000 Subject: r23210: Very funny, we thought to use netr_GetDcName (e.g. in winbind) but were using netr_GetDcAnyName all the time (which is the correct thing to do). Fix the naming and opcode mixup in all branches. Guenther (This used to be commit def6464c872a5939f0028837254f2c019d2d71c8) --- source3/rpc_parse/parse_net.c | 62 +++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'source3/rpc_parse') diff --git a/source3/rpc_parse/parse_net.c b/source3/rpc_parse/parse_net.c index 2f215dd938..20e4dea23c 100644 --- a/source3/rpc_parse/parse_net.c +++ b/source3/rpc_parse/parse_net.c @@ -480,12 +480,12 @@ BOOL net_io_r_logon_ctrl(const char *desc, NET_R_LOGON_CTRL *r_l, prs_struct *ps } /******************************************************************* - Inits an NET_R_GETDCNAME structure. + Inits an NET_R_GETANYDCNAME structure. ********************************************************************/ -void init_net_q_getdcname(NET_Q_GETDCNAME *r_t, const char *logon_server, - const char *domainname) +void init_net_q_getanydcname(NET_Q_GETANYDCNAME *r_t, const char *logon_server, + const char *domainname) { - DEBUG(5,("init_q_getdcname\n")); + DEBUG(5,("init_q_getanydcname\n")); r_t->ptr_logon_server = (logon_server != NULL); init_unistr2(&r_t->uni_logon_server, logon_server, UNI_STR_TERMINATE); @@ -494,16 +494,16 @@ void init_net_q_getdcname(NET_Q_GETDCNAME *r_t, const char *logon_server, } /******************************************************************* - Reads or writes an NET_Q_GETDCNAME structure. + Reads or writes an NET_Q_GETANYDCNAME structure. ********************************************************************/ -BOOL net_io_q_getdcname(const char *desc, NET_Q_GETDCNAME *r_t, prs_struct *ps, - int depth) +BOOL net_io_q_getanydcname(const char *desc, NET_Q_GETANYDCNAME *r_t, prs_struct *ps, + int depth) { if (r_t == NULL) return False; - prs_debug(ps, depth, desc, "net_io_q_getdcname"); + prs_debug(ps, depth, desc, "net_io_q_getanydcname"); depth++; if (!prs_uint32("ptr_logon_server", ps, depth, &r_t->ptr_logon_server)) @@ -528,26 +528,26 @@ BOOL net_io_q_getdcname(const char *desc, NET_Q_GETDCNAME *r_t, prs_struct *ps, /******************************************************************* - Inits an NET_R_GETDCNAME structure. + Inits an NET_R_GETANYDCNAME structure. ********************************************************************/ -void init_net_r_getdcname(NET_R_GETDCNAME *r_t, const char *dcname) +void init_net_r_getanydcname(NET_R_GETANYDCNAME *r_t, const char *dcname) { - DEBUG(5,("init_r_getdcname\n")); + DEBUG(5,("init_r_getanydcname\n")); init_unistr2(&r_t->uni_dcname, dcname, UNI_STR_TERMINATE); } /******************************************************************* - Reads or writes an NET_R_GETDCNAME structure. + Reads or writes an NET_R_GETANYDCNAME structure. ********************************************************************/ -BOOL net_io_r_getdcname(const char *desc, NET_R_GETDCNAME *r_t, prs_struct *ps, - int depth) +BOOL net_io_r_getanydcname(const char *desc, NET_R_GETANYDCNAME *r_t, prs_struct *ps, + int depth) { if (r_t == NULL) return False; - prs_debug(ps, depth, desc, "net_io_r_getdcname"); + prs_debug(ps, depth, desc, "net_io_r_getanydcname"); depth++; if (!prs_uint32("ptr_dcname", ps, depth, &r_t->ptr_dcname)) @@ -568,12 +568,12 @@ BOOL net_io_r_getdcname(const char *desc, NET_R_GETDCNAME *r_t, prs_struct *ps, /******************************************************************* - Inits an NET_R_GETANYDCNAME structure. + Inits an NET_R_GETDCNAME structure. ********************************************************************/ -void init_net_q_getanydcname(NET_Q_GETANYDCNAME *r_t, const char *logon_server, - const char *domainname) +void init_net_q_getdcname(NET_Q_GETDCNAME *r_t, const char *logon_server, + const char *domainname) { - DEBUG(5,("init_q_getanydcname\n")); + DEBUG(5,("init_q_getdcname\n")); init_unistr2(&r_t->uni_logon_server, logon_server, UNI_STR_TERMINATE); r_t->ptr_domainname = (domainname != NULL); @@ -581,16 +581,16 @@ void init_net_q_getanydcname(NET_Q_GETANYDCNAME *r_t, const char *logon_server, } /******************************************************************* - Reads or writes an NET_Q_GETANYDCNAME structure. + Reads or writes an NET_Q_GETDCNAME structure. ********************************************************************/ -BOOL net_io_q_getanydcname(const char *desc, NET_Q_GETANYDCNAME *r_t, prs_struct *ps, - int depth) +BOOL net_io_q_getdcname(const char *desc, NET_Q_GETDCNAME *r_t, prs_struct *ps, + int depth) { if (r_t == NULL) return False; - prs_debug(ps, depth, desc, "net_io_q_getanydcname"); + prs_debug(ps, depth, desc, "net_io_q_getdcname"); depth++; if (!smb_io_unistr2("logon_server", &r_t->uni_logon_server, @@ -612,26 +612,26 @@ BOOL net_io_q_getanydcname(const char *desc, NET_Q_GETANYDCNAME *r_t, prs_struct /******************************************************************* - Inits an NET_R_GETANYDCNAME structure. + Inits an NET_R_GETDCNAME structure. ********************************************************************/ -void init_net_r_getanydcname(NET_R_GETANYDCNAME *r_t, const char *dcname) +void init_net_r_getdcname(NET_R_GETDCNAME *r_t, const char *dcname) { - DEBUG(5,("init_r_getanydcname\n")); + DEBUG(5,("init_r_getdcname\n")); init_unistr2(&r_t->uni_dcname, dcname, UNI_STR_TERMINATE); } /******************************************************************* - Reads or writes an NET_R_GETANYDCNAME structure. + Reads or writes an NET_R_GETDCNAME structure. ********************************************************************/ -BOOL net_io_r_getanydcname(const char *desc, NET_R_GETANYDCNAME *r_t, prs_struct *ps, - int depth) +BOOL net_io_r_getdcname(const char *desc, NET_R_GETDCNAME *r_t, prs_struct *ps, + int depth) { if (r_t == NULL) return False; - prs_debug(ps, depth, desc, "net_io_r_getanydcname"); + prs_debug(ps, depth, desc, "net_io_r_getdcname"); depth++; if (!prs_uint32("ptr_dcname", ps, depth, &r_t->ptr_dcname)) @@ -644,7 +644,7 @@ BOOL net_io_r_getanydcname(const char *desc, NET_R_GETANYDCNAME *r_t, prs_struct if (!prs_align(ps)) return False; - if (!prs_werror("status", ps, depth, &r_t->status)) + if (!prs_ntstatus("status", ps, depth, &r_t->status)) return False; return True; -- cgit