Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration

(This used to be commit f59d3786abcc53065c838a2fa82ec2f4b577b16f)

1 files changed, 4 insertions, 84 deletions

diff --git a/source3/rpc_server/srv_eventlog.c b/source3/rpc_server/srv_eventlog.c
index 516ea134f2..5679a6acb6 100644
--- a/source3/rpc_server/srv_eventlog.c
+++ b/source3/rpc_server/srv_eventlog.c
@@ -42,27 +42,7 @@ static bool proxy_eventlog_call(pipes_struct *p, uint8 opnum)
 
 static bool api_eventlog_open_eventlog(pipes_struct *p)
 {
-	EVENTLOG_Q_OPEN_EVENTLOG q_u;
-	EVENTLOG_R_OPEN_EVENTLOG r_u;
-	prs_struct *data = &p->in_data.data;
-	prs_struct *rdata = &p->out_data.rdata;
-
-	ZERO_STRUCT(q_u);
-	ZERO_STRUCT(r_u);
-
-	if (!(eventlog_io_q_open_eventlog("", &q_u, data, 0))) {
-		DEBUG(0, ("eventlog_io_q_open_eventlog: unable to unmarshall EVENTLOG_Q_OPEN_EVENTLOG.\n"));
-		return False;
-	}
-	
-	r_u.status = _eventlog_open_eventlog(p, &q_u, &r_u);
-
-	if (!(eventlog_io_r_open_eventlog("", &r_u, rdata, 0))) {
-		DEBUG(0, ("eventlog_io_r_open_eventlog: unable to marshall EVENTLOG_R_OPEN_EVENTLOG.\n"));
-		return False;
-	}
-
-	return True;
+	return proxy_eventlog_call(p, NDR_EVENTLOG_OPENEVENTLOGW);
 }
 
 static bool api_eventlog_close_eventlog(pipes_struct *p)
@@ -72,52 +52,12 @@ static bool api_eventlog_close_eventlog(pipes_struct *p)
 
 static bool api_eventlog_get_num_records(pipes_struct *p)
 {
-	EVENTLOG_Q_GET_NUM_RECORDS q_u;
-	EVENTLOG_R_GET_NUM_RECORDS r_u;
-	prs_struct *data = &p->in_data.data;
-	prs_struct *rdata = &p->out_data.rdata;
-
-	ZERO_STRUCT(q_u);
-	ZERO_STRUCT(r_u);
-
-	if (!(eventlog_io_q_get_num_records("", &q_u, data, 0))) {
-		DEBUG(0, ("eventlog_io_q_get_num_records: unable to unmarshall EVENTLOG_Q_GET_NUM_RECORDS.\n"));
-		return False;
-	}
-    
-	r_u.status = _eventlog_get_num_records(p, &q_u, &r_u);
-    
-	if (!(eventlog_io_r_get_num_records("", &r_u, rdata, 0))) {
-		DEBUG(0, ("eventlog_io_r_get_num_records: unable to marshall EVENTLOG_R_GET_NUM_RECORDS.\n"));
-		return False;
-	}
-
-	return True;
+	return proxy_eventlog_call(p, NDR_EVENTLOG_GETNUMRECORDS);
 }
 
 static bool api_eventlog_get_oldest_entry(pipes_struct *p)
 {
-	EVENTLOG_Q_GET_OLDEST_ENTRY q_u;
-	EVENTLOG_R_GET_OLDEST_ENTRY r_u;
-	prs_struct *data = &p->in_data.data;
-	prs_struct *rdata = &p->out_data.rdata;
-
-	ZERO_STRUCT(q_u);
-	ZERO_STRUCT(r_u);
-
-	if (!(eventlog_io_q_get_oldest_entry("", &q_u, data, 0))) {
-		DEBUG(0, ("eventlog_io_q_get_oldest_entry: unable to unmarshall EVENTLOG_Q_GET_OLDEST_ENTRY.\n"));
-		return False;
-	}
-
-	r_u.status = _eventlog_get_oldest_entry(p, &q_u, &r_u);
-    
-	if (!(eventlog_io_r_get_oldest_entry("", &r_u, rdata, 0))) {
-		DEBUG(0, ("eventlog_io_r_get_oldest_entry: unable to marshall EVENTLOG_R_GET_OLDEST_ENTRY.\n"));
-		return False;
-	}
-    
-	return True;
+	return proxy_eventlog_call(p, NDR_EVENTLOG_GETOLDESTRECORD);
 }
 
 static bool api_eventlog_read_eventlog(pipes_struct *p)
@@ -147,27 +87,7 @@ static bool api_eventlog_read_eventlog(pipes_struct *p)
 
 static bool api_eventlog_clear_eventlog(pipes_struct *p)
 {
-	EVENTLOG_Q_CLEAR_EVENTLOG q_u;
-	EVENTLOG_R_CLEAR_EVENTLOG r_u;
-	prs_struct *data = &p->in_data.data;
-	prs_struct *rdata = &p->out_data.rdata;
-
-	ZERO_STRUCT(q_u);
-	ZERO_STRUCT(r_u);
-
-	if (!(eventlog_io_q_clear_eventlog("", &q_u, data, 0))) {
-		DEBUG(0, ("eventlog_io_q_clear_eventlog: unable to unmarshall EVENTLOG_Q_CLEAR_EVENTLOG.\n"));
-		return False;
-	}
-
-	r_u.status = _eventlog_clear_eventlog(p, &q_u, &r_u);
-
-	if (!(eventlog_io_r_clear_eventlog("", &r_u, rdata, 0))) {
-		DEBUG(0, ("eventlog_io_q_clear_eventlog: unable to marshall EVENTLOG_Q_CLEAR_EVENTLOG.\n"));
-		return False;
-	}
-
-	return True;
+	return proxy_eventlog_call(p, NDR_EVENTLOG_CLEAREVENTLOGW);
 }
 
 /*