This commit was manufactured by cvs2svn to create branch 'SAMBA_3_0'.(This used to...
[jra/samba/.git] / source3 / passdb / pdb_interface.c
index a19bf254e7a23c7a5fa8f4419caca12e1374691f..d21cc1d355cc62dd7e9a01265702773eca4417fc 100644 (file)
@@ -21,6 +21,9 @@
 
 #include "includes.h"
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_PASSDB
+
 /** List of various built-in passdb modules */
 
 const struct pdb_init_function_entry builtin_pdb_init_functions[] = {
@@ -30,24 +33,34 @@ const struct pdb_init_function_entry builtin_pdb_init_functions[] = {
        { "tdbsam_nua", pdb_init_tdbsam_nua },
        { "ldapsam", pdb_init_ldapsam },
        { "ldapsam_nua", pdb_init_ldapsam_nua },
+       { "unixsam", pdb_init_unixsam },
+       { "nisplussam", pdb_init_nisplussam },
        { "plugin", pdb_init_plugin },
        { NULL, NULL}
 };
 
-static BOOL context_setsampwent(struct pdb_context *context, BOOL update)
+static NTSTATUS context_setsampwent(struct pdb_context *context, BOOL update)
 {
-       if ((!context) || (!context->pdb_methods) || (!context->pdb_methods->setsampwent)) {
+       NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
+
+       if (!context) {
                DEBUG(0, ("invalid pdb_context specified!\n"));
-               return False;
+               return ret;
        }
 
        context->pwent_methods = context->pdb_methods;
-       
-       while(!(context->pwent_methods->setsampwent(context->pwent_methods, update))){
+
+       if (!context->pwent_methods) {
+               /* No passdbs at all */
+               return ret;
+       }
+
+       while (NT_STATUS_IS_ERR(ret = context->pwent_methods->setsampwent(context->pwent_methods, update))) {
                context->pwent_methods = context->pwent_methods->next;
-               if(context->pwent_methods == NULL)return False;
+               if (context->pwent_methods == NULL) 
+                       return NT_STATUS_UNSUCCESSFUL;
        }
-       return True;
+       return ret;
 }
 
 static void context_endsampwent(struct pdb_context *context)
@@ -57,87 +70,89 @@ static void context_endsampwent(struct pdb_context *context)
                return;
        }
 
-       if(context->pwent_methods && context->pwent_methods->endsampwent)
+       if (context->pwent_methods && context->pwent_methods->endsampwent)
                context->pwent_methods->endsampwent(context->pwent_methods);
 
        /* So we won't get strange data when calling getsampwent now */
        context->pwent_methods = NULL;
 }
 
-static BOOL context_getsampwent(struct pdb_context *context, SAM_ACCOUNT *user)
+static NTSTATUS context_getsampwent(struct pdb_context *context, SAM_ACCOUNT *user)
 {
+       NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
+
        if ((!context) || (!context->pwent_methods)) {
                DEBUG(0, ("invalid pdb_context specified!\n"));
-               return False;
+               return ret;
        }
        /* Loop until we find something useful */
-       while((!context->pwent_methods->getsampwent) || 
-                 context->pwent_methods->getsampwent(context->pwent_methods, user) == False){
+       while (NT_STATUS_IS_ERR(ret = context->pwent_methods->getsampwent(context->pwent_methods, user))) {
 
-               if(context->pwent_methods->endsampwent)
-                       context->pwent_methods->endsampwent(context->pwent_methods);
+               context->pwent_methods->endsampwent(context->pwent_methods);
 
                context->pwent_methods = context->pwent_methods->next;
 
                /* All methods are checked now. There are no more entries */
-               if(context->pwent_methods == NULL)return False;
+               if (context->pwent_methods == NULL)
+                       return ret;
        
-               if(!context->pwent_methods->setsampwent){
-                       DEBUG(0, ("invalid context->pwent_methods->setsampwent\n"));
-                       return False;
-               }
-
                context->pwent_methods->setsampwent(context->pwent_methods, False);
        }
        user->methods = context->pwent_methods;
-       return True;
+       return ret;
 }
 
-static BOOL context_getsampwnam(struct pdb_context *context, SAM_ACCOUNT *sam_acct, const char *username)
+static NTSTATUS context_getsampwnam(struct pdb_context *context, SAM_ACCOUNT *sam_acct, const char *username)
 {
+       NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
+
        struct pdb_methods *curmethods;
        if ((!context)) {
                DEBUG(0, ("invalid pdb_context specified!\n"));
-               return False;
+               return ret;
        }
        curmethods = context->pdb_methods;
-       while(curmethods){
-               if(curmethods->getsampwnam && curmethods->getsampwnam(curmethods, sam_acct, username) == True){
+       while (curmethods){
+               if (NT_STATUS_IS_OK(ret = curmethods->getsampwnam(curmethods, sam_acct, username))) {
                        sam_acct->methods = curmethods;
-                       return True;
+                       return ret;
                }
                curmethods = curmethods->next;
        }
 
-       return False;
+       return ret;
 }
 
-static BOOL context_getsampwrid(struct pdb_context *context, SAM_ACCOUNT *sam_acct, uint32 rid)
+static NTSTATUS context_getsampwsid(struct pdb_context *context, SAM_ACCOUNT *sam_acct, const DOM_SID *sid)
 {
+       NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
+
        struct pdb_methods *curmethods;
        if ((!context)) {
                DEBUG(0, ("invalid pdb_context specified!\n"));
-               return False;
+               return ret;
        }
        
        curmethods = context->pdb_methods;
 
-       while(curmethods){
-               if(curmethods->getsampwrid && curmethods->getsampwrid(curmethods, sam_acct, rid) == True){
+       while (curmethods){
+               if (NT_STATUS_IS_OK(ret = curmethods->getsampwsid(curmethods, sam_acct, sid))) {
                        sam_acct->methods = curmethods;
-                       return True;
+                       return ret;
                }
                curmethods = curmethods->next;
        }
 
-       return False;
+       return ret;
 }
 
-static BOOL context_add_sam_account(struct pdb_context *context, SAM_ACCOUNT *sam_acct)
+static NTSTATUS context_add_sam_account(struct pdb_context *context, SAM_ACCOUNT *sam_acct)
 {
-       if ((!context) || (!context->pdb_methods) || (!context->pdb_methods->add_sam_account)) {
+       NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
+
+       if ((!context) || (!context->pdb_methods)) {
                DEBUG(0, ("invalid pdb_context specified!\n"));
-               return False;
+               return ret;
        }
 
        /** @todo  This is where a 're-read on add' should be done */
@@ -147,21 +162,18 @@ static BOOL context_add_sam_account(struct pdb_context *context, SAM_ACCOUNT *sa
        return context->pdb_methods->add_sam_account(context->pdb_methods, sam_acct);
 }
 
-static BOOL context_update_sam_account(struct pdb_context *context, SAM_ACCOUNT *sam_acct)
+static NTSTATUS context_update_sam_account(struct pdb_context *context, SAM_ACCOUNT *sam_acct)
 {
+       NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
+
        if (!context) {
                DEBUG(0, ("invalid pdb_context specified!\n"));
-               return False;
+               return ret;
        }
 
-       if(!sam_acct || !sam_acct->methods){
+       if (!sam_acct || !sam_acct->methods){
                DEBUG(0, ("invalid sam_acct specified\n"));
-               return False;
-       }
-
-       if(!sam_acct->methods->update_sam_account){
-               DEBUG(0, ("invalid sam_acct->methods\n"));
-               return False;
+               return ret;
        }
 
        /** @todo  This is where a 're-read on update' should be done */
@@ -169,42 +181,181 @@ static BOOL context_update_sam_account(struct pdb_context *context, SAM_ACCOUNT
        return sam_acct->methods->update_sam_account(sam_acct->methods, sam_acct);
 }
 
-static BOOL context_delete_sam_account(struct pdb_context *context, SAM_ACCOUNT *sam_acct)
+static NTSTATUS context_delete_sam_account(struct pdb_context *context, SAM_ACCOUNT *sam_acct)
 {
+       NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
+
        struct pdb_methods *pdb_selected;
        if (!context) {
                DEBUG(0, ("invalid pdb_context specified!\n"));
-               return False;
+               return ret;
        }
 
-       if(!sam_acct->methods){
+       if (!sam_acct->methods){
                pdb_selected = context->pdb_methods;
                /* There's no passdb backend specified for this account.
-                * Try to delete it in every passdb available */
-               while(pdb_selected){
-                       if(pdb_selected->delete_sam_account && pdb_selected->delete_sam_account(pdb_selected, sam_acct)){
-                               return True;
+                * Try to delete it in every passdb available 
+                * Needed to delete accounts in smbpasswd that are not
+                * in /etc/passwd.
+                */
+               while (pdb_selected){
+                       if (NT_STATUS_IS_OK(ret = pdb_selected->delete_sam_account(pdb_selected, sam_acct))) {
+                               return ret;
                        }
                        pdb_selected = pdb_selected->next;
                }
-               return False;
+               return ret;
        }
 
-       if(!sam_acct->methods->delete_sam_account){
+       if (!sam_acct->methods->delete_sam_account){
                DEBUG(0,("invalid sam_acct->methods->delete_sam_account\n"));
-               return False;
+               return ret;
        }
        
        return sam_acct->methods->delete_sam_account(sam_acct->methods, sam_acct);
 }
 
+static NTSTATUS context_getgrsid(struct pdb_context *context,
+                                GROUP_MAP *map, DOM_SID sid, BOOL with_priv)
+{
+       NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
+
+       struct pdb_methods *curmethods;
+       if ((!context)) {
+               DEBUG(0, ("invalid pdb_context specified!\n"));
+               return ret;
+       }
+       curmethods = context->pdb_methods;
+       while (curmethods){
+               ret = curmethods->getgrsid(curmethods, map, sid, with_priv);
+               if (NT_STATUS_IS_OK(ret)) {
+                       map->methods = curmethods;
+                       return ret;
+               }
+               curmethods = curmethods->next;
+       }
+
+       return ret;
+}
+
+static NTSTATUS context_getgrgid(struct pdb_context *context,
+                                GROUP_MAP *map, gid_t gid, BOOL with_priv)
+{
+       NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
+
+       struct pdb_methods *curmethods;
+       if ((!context)) {
+               DEBUG(0, ("invalid pdb_context specified!\n"));
+               return ret;
+       }
+       curmethods = context->pdb_methods;
+       while (curmethods){
+               ret = curmethods->getgrgid(curmethods, map, gid, with_priv);
+               if (NT_STATUS_IS_OK(ret)) {
+                       map->methods = curmethods;
+                       return ret;
+               }
+               curmethods = curmethods->next;
+       }
+
+       return ret;
+}
+
+static NTSTATUS context_getgrnam(struct pdb_context *context,
+                                GROUP_MAP *map, char *name, BOOL with_priv)
+{
+       NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
+
+       struct pdb_methods *curmethods;
+       if ((!context)) {
+               DEBUG(0, ("invalid pdb_context specified!\n"));
+               return ret;
+       }
+       curmethods = context->pdb_methods;
+       while (curmethods){
+               ret = curmethods->getgrnam(curmethods, map, name, with_priv);
+               if (NT_STATUS_IS_OK(ret)) {
+                       map->methods = curmethods;
+                       return ret;
+               }
+               curmethods = curmethods->next;
+       }
+
+       return ret;
+}
+
+static NTSTATUS context_add_group_mapping_entry(struct pdb_context *context,
+                                               GROUP_MAP *map)
+{
+       NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
+
+       if ((!context) || (!context->pdb_methods)) {
+               DEBUG(0, ("invalid pdb_context specified!\n"));
+               return ret;
+       }
+
+       return context->pdb_methods->add_group_mapping_entry(context->pdb_methods,
+                                                            map);
+}
+
+static NTSTATUS context_update_group_mapping_entry(struct pdb_context *context,
+                                                  GROUP_MAP *map)
+{
+       NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
+
+       if ((!context) || (!context->pdb_methods)) {
+               DEBUG(0, ("invalid pdb_context specified!\n"));
+               return ret;
+       }
+
+       return context->
+               pdb_methods->update_group_mapping_entry(context->pdb_methods, map);
+}
+
+static NTSTATUS context_delete_group_mapping_entry(struct pdb_context *context,
+                                                  DOM_SID sid)
+{
+       NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
+
+       if ((!context) || (!context->pdb_methods)) {
+               DEBUG(0, ("invalid pdb_context specified!\n"));
+               return ret;
+       }
+
+       return context->
+               pdb_methods->delete_group_mapping_entry(context->pdb_methods, sid);
+}
+
+static NTSTATUS context_enum_group_mapping(struct pdb_context *context,
+                                          enum SID_NAME_USE sid_name_use,
+                                          GROUP_MAP **rmap, int *num_entries,
+                                          BOOL unix_only, BOOL with_priv)
+{
+       NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
+
+       if ((!context) || (!context->pdb_methods)) {
+               DEBUG(0, ("invalid pdb_context specified!\n"));
+               return ret;
+       }
+
+       return context->pdb_methods->enum_group_mapping(context->pdb_methods,
+                                                       sid_name_use, rmap,
+                                                       num_entries, unix_only,
+                                                       with_priv);
+}
+
+/******************************************************************
+  Free and cleanup a pdb context, any associated data and anything
+  that the attached modules might have associated.
+ *******************************************************************/
+
 static void free_pdb_context(struct pdb_context **context)
 {
        struct pdb_methods *pdb_selected = (*context)->pdb_methods;
 
-       while(pdb_selected){
+       while (pdb_selected){
                if(pdb_selected->free_private_data)
-                       pdb_selected->free_private_data(pdb_selected->private_data);
+                       pdb_selected->free_private_data(&(pdb_selected->private_data));
                pdb_selected = pdb_selected->next;
        }
 
@@ -239,21 +390,21 @@ static NTSTATUS make_pdb_methods_name(struct pdb_methods **methods, struct pdb_c
                if (strequal(builtin_pdb_init_functions[i].name, module_name))
                {
                        DEBUG(5,("Found pdb backend %s (at pos %d)\n", module_name, i));
-                       if (NT_STATUS_IS_OK(nt_status 
-                                           = builtin_pdb_init_functions[i].init(context, methods, module_location))) {
+                       nt_status = builtin_pdb_init_functions[i].init(context, methods, module_location);
+                       if (NT_STATUS_IS_OK(nt_status)) {
                                DEBUG(5,("pdb backend %s has a valid init\n", selected));
                        } else {
                                DEBUG(0,("pdb backend %s did not correctly init (error was %s)\n", selected, nt_errstr(nt_status)));
                        }
-                       break;
+                       SAFE_FREE(module_name);
+                       return nt_status;
+                       break; /* unreached */
                }
        }
 
-       if (!*methods) {
-               DEBUG(0,("failed to select passdb backed!\n"));
-               return nt_status;
-       }
-       return NT_STATUS_OK;
+       /* No such backend found */
+       SAFE_FREE(module_name);
+       return NT_STATUS_INVALID_PARAMETER;
 }
 
 /******************************************************************
@@ -264,7 +415,7 @@ static NTSTATUS make_pdb_context(struct pdb_context **context)
 {
        TALLOC_CTX *mem_ctx;
 
-       mem_ctx = talloc_init_named("pdb_context internal allocation context");
+       mem_ctx = talloc_init("pdb_context internal allocation context");
 
        if (!mem_ctx) {
                DEBUG(0, ("make_pdb_context: talloc init failed!\n"));
@@ -285,13 +436,17 @@ static NTSTATUS make_pdb_context(struct pdb_context **context)
        (*context)->pdb_endsampwent = context_endsampwent;
        (*context)->pdb_getsampwent = context_getsampwent;
        (*context)->pdb_getsampwnam = context_getsampwnam;
-       (*context)->pdb_getsampwrid = context_getsampwrid;
+       (*context)->pdb_getsampwsid = context_getsampwsid;
        (*context)->pdb_add_sam_account = context_add_sam_account;
        (*context)->pdb_update_sam_account = context_update_sam_account;
        (*context)->pdb_delete_sam_account = context_delete_sam_account;
-
-       (*context)->pdb_methods = NULL;
-       (*context)->pwent_methods = NULL;
+       (*context)->pdb_getgrsid = context_getgrsid;
+       (*context)->pdb_getgrgid = context_getgrgid;
+       (*context)->pdb_getgrnam = context_getgrnam;
+       (*context)->pdb_add_group_mapping_entry = context_add_group_mapping_entry;
+       (*context)->pdb_update_group_mapping_entry = context_update_group_mapping_entry;
+       (*context)->pdb_delete_group_mapping_entry = context_delete_group_mapping_entry;
+       (*context)->pdb_enum_group_mapping = context_enum_group_mapping;
 
        (*context)->free_fn = free_pdb_context;
 
@@ -300,46 +455,46 @@ static NTSTATUS make_pdb_context(struct pdb_context **context)
 
 
 /******************************************************************
-  Make a pdb_context, given a text string.
+  Make a pdb_context, given an array of strings
  *******************************************************************/
 
-NTSTATUS make_pdb_context_name(struct pdb_context **context, const char *selected) 
+NTSTATUS make_pdb_context_list(struct pdb_context **context, const char **selected) 
 {
-       /* HINT: Don't store 'selected' becouse its often an lp_ string and will 'go away' */
-       char *conf = smb_xstrdup(selected);
-       char *confcur = conf, *confnext;
+       int i = 0;
        struct pdb_methods *curmethods, *tmpmethods;
        NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
 
-       if(!NT_STATUS_IS_OK(nt_status = make_pdb_context(context))){
+       if (!NT_STATUS_IS_OK(nt_status = make_pdb_context(context))) {
                return nt_status;
        }
 
-       while(confcur){
-               if(strchr(confcur, ' ')){
-                       confnext = strchr(confcur,' ');
-                       *confnext = '\0';
-                       confnext++;
-               }else confnext = NULL;
-
+       while (selected[i]){
                /* Try to initialise pdb */
-               DEBUG(5,("Trying to load: %s\n", confcur));
-               if(!NT_STATUS_IS_OK(make_pdb_methods_name(&curmethods, *context, confcur))){
-                       DEBUG(5, ("Loading %s failed!\n", confcur));
-                       SAFE_FREE(curmethods);
-                       continue;
+               DEBUG(5,("Trying to load: %s\n", selected[i]));
+               if (!NT_STATUS_IS_OK(nt_status = make_pdb_methods_name(&curmethods, *context, selected[i]))) {
+                       DEBUG(1, ("Loading %s failed!\n", selected[i]));
+                       free_pdb_context(context);
+                       return nt_status;
                }
                curmethods->parent = *context;
                DLIST_ADD_END((*context)->pdb_methods, curmethods, tmpmethods);
-
-               if(!confnext)break;
-               confcur = confnext;
+               i++;
        }
-       SAFE_FREE(conf);
 
-       nt_status = NT_STATUS_OK;
+       return NT_STATUS_OK;
+}
+
+/******************************************************************
+  Make a pdb_context, given a text string.
+ *******************************************************************/
 
-       return nt_status;
+NTSTATUS make_pdb_context_string(struct pdb_context **context, const char *selected) 
+{
+       NTSTATUS ret;
+       char **newsel = str_list_make(selected, NULL);
+       ret = make_pdb_context_list(context, (const char **)newsel);
+       str_list_free(&newsel);
+       return ret;
 }
 
 /******************************************************************
@@ -353,13 +508,13 @@ static struct pdb_context *pdb_get_static_context(BOOL reload)
 
        if ((pdb_context) && (reload)) {
                pdb_context->free_fn(&pdb_context);
-               if (!NT_STATUS_IS_OK(make_pdb_context_name(&pdb_context, lp_passdb_backend()))) {
+               if (NT_STATUS_IS_ERR(make_pdb_context_list(&pdb_context, lp_passdb_backend()))) {
                        return NULL;
                }
        }
 
        if (!pdb_context) {
-               if (!NT_STATUS_IS_OK(make_pdb_context_name(&pdb_context, lp_passdb_backend()))) {
+               if (NT_STATUS_IS_ERR(make_pdb_context_list(&pdb_context, lp_passdb_backend()))) {
                        return NULL;
                }
        }
@@ -367,8 +522,6 @@ static struct pdb_context *pdb_get_static_context(BOOL reload)
        return pdb_context;
 }
 
-#if !defined(WITH_NISPLUS_SAM)
-
 /******************************************************************
  Backward compatibility functions for the original passdb interface
 *******************************************************************/
@@ -381,7 +534,7 @@ BOOL pdb_setsampwent(BOOL update)
                return False;
        }
 
-       return pdb_context->pdb_setsampwent(pdb_context, update);
+       return NT_STATUS_IS_OK(pdb_context->pdb_setsampwent(pdb_context, update));
 }
 
 void pdb_endsampwent(void) 
@@ -403,7 +556,7 @@ BOOL pdb_getsampwent(SAM_ACCOUNT *user)
                return False;
        }
 
-       return pdb_context->pdb_getsampwent(pdb_context, user);
+       return NT_STATUS_IS_OK(pdb_context->pdb_getsampwent(pdb_context, user));
 }
 
 BOOL pdb_getsampwnam(SAM_ACCOUNT *sam_acct, const char *username) 
@@ -414,10 +567,10 @@ BOOL pdb_getsampwnam(SAM_ACCOUNT *sam_acct, const char *username)
                return False;
        }
 
-       return pdb_context->pdb_getsampwnam(pdb_context, sam_acct, username);
+       return NT_STATUS_IS_OK(pdb_context->pdb_getsampwnam(pdb_context, sam_acct, username));
 }
 
-BOOL pdb_getsampwrid(SAM_ACCOUNT *sam_acct, uint32 rid) 
+BOOL pdb_getsampwsid(SAM_ACCOUNT *sam_acct, const DOM_SID *sid) 
 {
        struct pdb_context *pdb_context = pdb_get_static_context(False);
 
@@ -425,7 +578,7 @@ BOOL pdb_getsampwrid(SAM_ACCOUNT *sam_acct, uint32 rid)
                return False;
        }
 
-       return pdb_context->pdb_getsampwrid(pdb_context, sam_acct, rid);
+       return NT_STATUS_IS_OK(pdb_context->pdb_getsampwsid(pdb_context, sam_acct, sid));
 }
 
 BOOL pdb_add_sam_account(SAM_ACCOUNT *sam_acct) 
@@ -436,7 +589,7 @@ BOOL pdb_add_sam_account(SAM_ACCOUNT *sam_acct)
                return False;
        }
 
-       return pdb_context->pdb_add_sam_account(pdb_context, sam_acct);
+       return NT_STATUS_IS_OK(pdb_context->pdb_add_sam_account(pdb_context, sam_acct));
 }
 
 BOOL pdb_update_sam_account(SAM_ACCOUNT *sam_acct) 
@@ -447,7 +600,7 @@ BOOL pdb_update_sam_account(SAM_ACCOUNT *sam_acct)
                return False;
        }
 
-       return pdb_context->pdb_update_sam_account(pdb_context, sam_acct);
+       return NT_STATUS_IS_OK(pdb_context->pdb_update_sam_account(pdb_context, sam_acct));
 }
 
 BOOL pdb_delete_sam_account(SAM_ACCOUNT *sam_acct) 
@@ -458,10 +611,95 @@ BOOL pdb_delete_sam_account(SAM_ACCOUNT *sam_acct)
                return False;
        }
 
-       return pdb_context->pdb_delete_sam_account(pdb_context, sam_acct);
+       return NT_STATUS_IS_OK(pdb_context->pdb_delete_sam_account(pdb_context, sam_acct));
+}
+
+BOOL pdb_getgrsid(GROUP_MAP *map, DOM_SID sid, BOOL with_priv)
+{
+       struct pdb_context *pdb_context = pdb_get_static_context(False);
+
+       if (!pdb_context) {
+               return False;
+       }
+
+       return NT_STATUS_IS_OK(pdb_context->
+                              pdb_getgrsid(pdb_context, map, sid, with_priv));
+}
+
+BOOL pdb_getgrgid(GROUP_MAP *map, gid_t gid, BOOL with_priv)
+{
+       struct pdb_context *pdb_context = pdb_get_static_context(False);
+
+       if (!pdb_context) {
+               return False;
+       }
+
+       return NT_STATUS_IS_OK(pdb_context->
+                              pdb_getgrgid(pdb_context, map, gid, with_priv));
 }
 
-#endif /* !defined(WITH_NISPLUS_SAM) */
+BOOL pdb_getgrnam(GROUP_MAP *map, char *name, BOOL with_priv)
+{
+       struct pdb_context *pdb_context = pdb_get_static_context(False);
+
+       if (!pdb_context) {
+               return False;
+       }
+
+       return NT_STATUS_IS_OK(pdb_context->
+                              pdb_getgrnam(pdb_context, map, name, with_priv));
+}
+
+BOOL pdb_add_group_mapping_entry(GROUP_MAP *map)
+{
+       struct pdb_context *pdb_context = pdb_get_static_context(False);
+
+       if (!pdb_context) {
+               return False;
+       }
+
+       return NT_STATUS_IS_OK(pdb_context->
+                              pdb_add_group_mapping_entry(pdb_context, map));
+}
+
+BOOL pdb_update_group_mapping_entry(GROUP_MAP *map)
+{
+       struct pdb_context *pdb_context = pdb_get_static_context(False);
+
+       if (!pdb_context) {
+               return False;
+       }
+
+       return NT_STATUS_IS_OK(pdb_context->
+                              pdb_update_group_mapping_entry(pdb_context, map));
+}
+
+BOOL pdb_delete_group_mapping_entry(DOM_SID sid)
+{
+       struct pdb_context *pdb_context = pdb_get_static_context(False);
+
+       if (!pdb_context) {
+               return False;
+       }
+
+       return NT_STATUS_IS_OK(pdb_context->
+                              pdb_delete_group_mapping_entry(pdb_context, sid));
+}
+
+BOOL pdb_enum_group_mapping(enum SID_NAME_USE sid_name_use, GROUP_MAP **rmap,
+                           int *num_entries, BOOL unix_only, BOOL with_priv)
+{
+       struct pdb_context *pdb_context = pdb_get_static_context(False);
+
+       if (!pdb_context) {
+               return False;
+       }
+
+       return NT_STATUS_IS_OK(pdb_context->
+                              pdb_enum_group_mapping(pdb_context, sid_name_use,
+                                                     rmap, num_entries, unix_only,
+                                                     with_priv));
+}
 
 /***************************************************************
   Initialize the static context (at smbd startup etc).