s3-ntsvcs: remove old _PNP_GetDeviceList.

Guenther

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 24929f6d7fe1d0e0ec72c801fb223b844fd2425b..9c3aba29afc0d6f23a680cdac2bdff7fa85b0cff 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -6025,9 +6025,6 @@ bool policy_handle_is_valid(const POLICY_HND *hnd);
 
 /* The following definitions come from rpc_parse/parse_ntsvcs.c  */
 
-bool ntsvcs_io_q_get_device_list(const char *desc, NTSVCS_Q_GET_DEVICE_LIST *q_u, prs_struct *ps, int depth);
-bool ntsvcs_io_r_get_device_list(const char *desc, NTSVCS_R_GET_DEVICE_LIST *r_u, prs_struct *ps, int depth);
-
 /* The following definitions come from rpc_parse/parse_prs.c  */
 
 void prs_dump(const char *name, int v, prs_struct *ps);

diff --git a/source3/include/rpc_ntsvcs.h b/source3/include/rpc_ntsvcs.h
index dc74298cb9ef807a75c6ac6a0471308934b06c43..14e11cf6a197142f1d77bb3f54d53e37ca9e566d 100644 (file)
--- a/source3/include/rpc_ntsvcs.h
+++ b/source3/include/rpc_ntsvcs.h
@@ -33,18 +33,4 @@
 #define NTSVCS_GET_VERSION_INTERNAL    0x3e
 
 
-/**************************/
-
-typedef struct {
-       UNISTR2 *devicename;
-       uint32 buffer_size;
-       uint32 flags;
-} NTSVCS_Q_GET_DEVICE_LIST;
-
-typedef struct {
-       UNISTR2 devicepath;
-       uint32 needed;
-       WERROR status;
-} NTSVCS_R_GET_DEVICE_LIST;
-
 #endif /* _RPC_NTSVCS_H */

diff --git a/source3/rpc_parse/parse_ntsvcs.c b/source3/rpc_parse/parse_ntsvcs.c
index 17b51fa75122039e630599ffcb8a97b155559295..d347277ad8308bbbb3387d84ac35ecc942b69312 100644 (file)
--- a/source3/rpc_parse/parse_ntsvcs.c
+++ b/source3/rpc_parse/parse_ntsvcs.c
@@ -22,58 +22,3 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_PARSE
 
-/*******************************************************************
-********************************************************************/
-
-bool ntsvcs_io_q_get_device_list(const char *desc, NTSVCS_Q_GET_DEVICE_LIST *q_u, prs_struct *ps, int depth)
-{
-       if (q_u == NULL)
-               return False;
-
-       prs_debug(ps, depth, desc, "ntsvcs_io_q_get_device_list");
-       depth++;
-       
-       if(!prs_align(ps))
-               return False;
-
-       if ( !prs_pointer("devicename", ps, depth, (void*)&q_u->devicename, sizeof(UNISTR2), (PRS_POINTER_CAST)prs_io_unistr2) )
-               return False;
-       if( !prs_align(ps) )
-               return False;
-               
-       if ( !prs_uint32("buffer_size", ps, depth, &q_u->buffer_size) )
-               return False;
-       if ( !prs_uint32("flags", ps, depth, &q_u->flags) )
-               return False;
-       
-       return True;
-
-}
-
-/*******************************************************************
-********************************************************************/
-
-bool ntsvcs_io_r_get_device_list(const char *desc, NTSVCS_R_GET_DEVICE_LIST *r_u, prs_struct *ps, int depth)
-{
-       if ( !r_u )
-               return False;
-
-       prs_debug(ps, depth, desc, "ntsvcs_io_r_get_device_list_size");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-               
-       if ( !prs_io_unistr2("devicepath", ps, depth, &r_u->devicepath) )
-               return False;
-       if(!prs_align(ps))
-               return False;
-               
-       if(!prs_uint32("needed", ps, depth, &r_u->needed))
-               return False;
-               
-       if(!prs_werror("status", ps, depth, &r_u->status))
-               return False;
-
-       return True;
-}