diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2012-07-20 12:27:19 +0000 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2012-07-20 12:27:19 +0000 |
| commit | b28a4e39bcc4e48b08e615dcc51a8118a706326a (patch) | |
| tree | 68ddb72eba9865026ac1171e907786e279eab0a2 /nslcd/nslcd.c | |
| parent | 08e0feea8b0330b16d2503929686479752843619 (diff) | |
on startup have the gid option default to the primary group of the specified user and load the user's supplementary groups
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1723 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'nslcd/nslcd.c')
| -rw-r--r-- | nslcd/nslcd.c | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/nslcd/nslcd.c b/nslcd/nslcd.c index 773d6db..20515e3 100644 --- a/nslcd/nslcd.c +++ b/nslcd/nslcd.c @@ -42,9 +42,7 @@ #include <sys/stat.h> #include <sys/socket.h> #include <sys/un.h> -#ifdef HAVE_GRP_H #include <grp.h> -#endif /* HAVE_GRP_H */ #ifdef HAVE_NSS_H #include <nss.h> #endif /* HAVE_NSS_H */ @@ -741,15 +739,28 @@ int main(int argc,char *argv[]) } /* create socket */ nslcd_serversocket=create_socket(NSLCD_SOCKET); + if ((nslcd_cfg->ldc_gid!=NOGID)&&(nslcd_cfg->ldc_uidname!=NULL)) + { +#ifdef HAVE_INITGROUPS + /* load supplementary groups */ + if (initgroups(nslcd_cfg->ldc_uidname,nslcd_cfg->ldc_gid)<0) + log_log(LOG_WARNING,"cannot initgroups(\"%s\",%d) (ignored): %s", + nslcd_cfg->ldc_uidname,nslcd_cfg->ldc_gid,strerror(errno)); + else + log_log(LOG_DEBUG,"initgroups(\"%s\",%d) done", + nslcd_cfg->ldc_uidname,nslcd_cfg->ldc_gid); +#else /* not HAVE_INITGROUPS */ #ifdef HAVE_SETGROUPS - /* drop all supplemental groups */ - if (setgroups(0,NULL)<0) - log_log(LOG_WARNING,"cannot setgroups(0,NULL) (ignored): %s",strerror(errno)); - else - log_log(LOG_DEBUG,"setgroups(0,NULL) done"); -#else /* HAVE_SETGROUPS */ - log_log(LOG_DEBUG,"setgroups() not available"); + /* just drop all supplemental groups */ + if (setgroups(0,NULL)<0) + log_log(LOG_WARNING,"cannot setgroups(0,NULL) (ignored): %s",strerror(errno)); + else + log_log(LOG_DEBUG,"setgroups(0,NULL) done"); +#else /* not HAVE_SETGROUPS */ + log_log(LOG_DEBUG,"neither initgroups() or setgroups() available"); #endif /* not HAVE_SETGROUPS */ +#endif /* not HAVE_INITGROUPS */ + } /* change to nslcd gid */ if (nslcd_cfg->ldc_gid!=NOGID) { |