Merge ldb_search() and ldb_search_exp_fmt() into a simgle function.

[tprouty/samba.git] / source4 / libnet / libnet.h

diff --git a/source4/libnet/libnet.h b/source4/libnet/libnet.h
index 4134675bda422febfa44dc965988ec60bf72b178..b65a13ce370e0ae83cfcf7b8c7e2145a1cb3ff92 100644 (file)
--- a/source4/libnet/libnet.h
+++ b/source4/libnet/libnet.h
@@ -18,6 +18,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "librpc/gen_ndr/misc.h"
+
 struct libnet_context {
        /* here we need:
         * a client env context
@@ -28,7 +30,7 @@ struct libnet_context {
        /* samr connection parameters - opened handles and related properties */
        struct {
                struct dcerpc_pipe *pipe;
-               char *name;
+               const char *name;
                struct dom_sid *sid;
                uint32_t access_mask;
                struct policy_handle handle;
@@ -39,15 +41,17 @@ struct libnet_context {
        /* lsa connection parameters - opened handles and related properties */
        struct {
                struct dcerpc_pipe *pipe;
-               char *name;
+               const char *name;
                uint32_t access_mask;
                struct policy_handle handle;
        } lsa;
 
        /* name resolution methods */
-       const char **name_res_methods;
+       struct resolve_context *resolve_ctx;
 
        struct event_context *event_ctx;
+
+       struct loadparm_context *lp_ctx;
 };
 
 
@@ -56,6 +60,7 @@ struct libnet_context {
 #include "libnet/userman.h"
 #include "libnet/userinfo.h"
 #include "libnet/groupinfo.h"
+#include "libnet/groupman.h"
 #include "libnet/libnet_passwd.h"
 #include "libnet/libnet_time.h"
 #include "libnet/libnet_rpc.h"
@@ -63,8 +68,10 @@ struct libnet_context {
 #include "libnet/libnet_site.h"
 #include "libnet/libnet_become_dc.h"
 #include "libnet/libnet_unbecome_dc.h"
+#include "libnet/libnet_samsync.h"
 #include "libnet/libnet_vampire.h"
 #include "libnet/libnet_user.h"
+#include "libnet/libnet_group.h"
 #include "libnet/libnet_share.h"
 #include "libnet/libnet_lookup.h"
 #include "libnet/libnet_domain.h"