import Solaris support developed by Ted C. Cheng of Symas Corporation merged against SVN head (parts remain to be cleaned up)

git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd-solaris@1232 ef36b2f9-881f-0410-afb5-c4e39611909c
author: Arthur de Jong <arthur@arthurdejong.org> 2010-09-30 21:58:21 +0200
committer: Arthur de Jong <arthur@arthurdejong.org> 2010-09-30 21:58:21 +0200
commit: 8eac6f4f55cee0a6183983f2fcd8db73dc76c8a9 (patch)
tree: c8281f14dd39c3d7460fa40fb3f002824917402d /nss/passwd.c
parent: 5c0c01cfd1351cb97edd027b2b87f61a16b61281 (diff)
1 files changed, 165 insertions, 4 deletions
diff --git a/nss/passwd.c b/nss/passwd.c
index 6787d60..aaa346a 100644
--- a/nss/passwd.c
+++ b/nss/passwd.c
@@ -2,7 +2,8 @@
    passwd.c - NSS lookup functions for passwd database
 
    Copyright (C) 2006 West Consulting
-   Copyright (C) 2006, 2007, 2008 Arthur de Jong
+   Copyright (C) 2006, 2007, 2008, 2010 Arthur de Jong
+   Copyright (C) 2010 Symas Corporation
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -45,14 +46,26 @@ static nss_status_t read_passwd(
   return NSS_STATUS_SUCCESS;
 }
 
-nss_status_t _nss_ldap_getpwnam_r(const char *name,struct passwd *result,char *buffer,size_t buflen,int *errnop)
+#ifdef HAVE_NSSWITCH_H
+nss_status_t _nss_nslcd_getpwnam_r(
+#else /* not HAVE_NSSWITCH_H */
+nss_status_t _nss_ldap_getpwnam_r(
+#endif /* HAVE_NSSWITCH_H */
+        const char *name,struct passwd *result,char *buffer,size_t buflen,
+        int *errnop)
 {
   NSS_BYNAME(NSLCD_ACTION_PASSWD_BYNAME,
              name,
              read_passwd(fp,result,buffer,buflen,errnop));
 }
 
-nss_status_t _nss_ldap_getpwuid_r(uid_t uid,struct passwd *result,char *buffer,size_t buflen,int *errnop)
+#ifdef HAVE_NSSWITCH_H
+nss_status_t _nss_nslcd_getpwuid_r(
+#else /* not HAVE_NSSWITCH_H */
+nss_status_t _nss_ldap_getpwuid_r(
+#endif /* HAVE_NSSWITCH_H */
+        uid_t uid,struct passwd *result,char *buffer,
+        size_t buflen,int *errnop)
 {
   NSS_BYTYPE(NSLCD_ACTION_PASSWD_BYUID,
              uid,uid_t,
@@ -63,20 +76,168 @@ nss_status_t _nss_ldap_getpwuid_r(uid_t uid,struct passwd *result,char *buffer,s
 static __thread TFILE *pwentfp;
 
 /* open a connection to the nslcd and write the request */
+#ifdef HAVE_NSSWITCH_H
+nss_status_t _nss_ldap_setpwent(nss_backend_t *be,void *args)
+#else /* not HAVE_NSSWITCH_H */
 nss_status_t _nss_ldap_setpwent(int UNUSED(stayopen))
+#endif /* HAVE_NSSWITCH_H */
 {
   NSS_SETENT(pwentfp);
 }
 
 /* read password data from an opened stream */
-nss_status_t _nss_ldap_getpwent_r(struct passwd *result,char *buffer,size_t buflen,int *errnop)
+#ifdef HAVE_NSSWITCH_H
+nss_status_t _nss_nslcd_getpwent_r(
+#else /* not HAVE_NSSWITCH_H */
+nss_status_t _nss_ldap_getpwent_r(
+#endif /* HAVE_NSSWITCH_H */
+        struct passwd *result,char *buffer,size_t buflen,int *errnop)
 {
   NSS_GETENT(pwentfp,NSLCD_ACTION_PASSWD_ALL,
              read_passwd(pwentfp,result,buffer,buflen,errnop));
 }
 
 /* close the stream opened with setpwent() above */
+#ifdef HAVE_NSSWITCH_H
+nss_status_t _nss_ldap_endpwent(nss_backend_t *be,void *args)
+#else /* not HAVE_NSSWITCH_H */
 nss_status_t _nss_ldap_endpwent(void)
+#endif /* HAVE_NSSWITCH_H */
 {
   NSS_ENDENT(pwentfp);
 }
+
+#ifdef HAVE_NSSWITCH_H
+static nss_status_t _nss_ldap_getpwnam_r(nss_backend_t *be,void *args)
+{
+  struct passwd priv_pw;
+  struct passwd *pw=NSS_ARGS(args)->buf.result?(struct passwd *)NSS_ARGS(args)->buf.result:&priv_pw;
+  char *buffer=NSS_ARGS(args)->buf.buffer;
+  size_t buflen=NSS_ARGS(args)->buf.buflen;
+  char *name=(char *)NSS_ARGS(args)->key.name;
+  char *data_ptr;
+  nss_status_t status;
+  if (NSS_ARGS(args)->buf.buflen < 0)
+  {
+    NSS_ARGS(args)->erange=1;
+    status=NSS_STATUS_TRYAGAIN;
+    return status;
+  }
+  status=_nss_nslcd_getpwnam_r(name,pw,buffer,buflen,&errno);
+  if (status!=NSS_STATUS_SUCCESS)
+    return status;
+  if (!NSS_ARGS(args)->buf.result)
+  {
+     /* result==NULL, return file format */
+     data_ptr=(char *)malloc(buflen);
+     sprintf(data_ptr,"%s:%s:%d:%d:%s:%s:%s",
+       pw->pw_name,"x",(int) pw->pw_uid,(int) pw->pw_gid,pw->pw_gecos,
+       pw->pw_dir,pw->pw_shell);
+     /* copy file-format data to buffer provided by front-end */
+     strcpy(buffer,data_ptr);
+     if (data_ptr)
+        free(data_ptr);
+     NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.buffer;
+     NSS_ARGS(args)->returnlen=strlen(NSS_ARGS(args)->buf.buffer);
+  }
+  else
+  {
+     NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.result;
+  }
+  return status;
+}
+
+static nss_status_t _nss_ldap_getpwuid_r(nss_backend_t *be,void *args)
+{
+  struct passwd priv_pw;
+  struct passwd *pw=NSS_ARGS(args)->buf.result ?
+                NSS_ARGS(args)->buf.result : &priv_pw;
+  uid_t uid=NSS_ARGS(args)->key.uid;
+  char *data_ptr;
+  char *buffer=NSS_ARGS(args)->buf.buffer;
+  size_t buflen=NSS_ARGS(args)->buf.buflen;
+  nss_status_t status;
+  status=_nss_nslcd_getpwuid_r(uid,pw,buffer,buflen,&errno);
+  if (status!=NSS_STATUS_SUCCESS)
+    return status;
+  if (!NSS_ARGS(args)->buf.result)
+  {
+    /* result==NULL, return file format */
+    data_ptr=(char *)malloc((size_t) buflen);
+    sprintf(data_ptr,"%s:%s:%d:%d:%s:%s:%s",
+            pw->pw_name,"x",(int) pw->pw_uid,(int) pw->pw_gid,pw->pw_gecos,
+            pw->pw_dir,pw->pw_shell);
+    /* copy file-format data to buffer provided by front-end */
+    strcpy(buffer,data_ptr);
+    if (data_ptr)
+      free((void *)data_ptr);
+    NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.buffer;
+    NSS_ARGS(args)->returnlen=strlen(NSS_ARGS(args)->buf.buffer);
+  }
+  else
+  {
+     NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.result;
+  }
+  return status;
+}
+
+static nss_status_t _nss_ldap_getpwent_r(nss_backend_t *be,void *args)
+{
+  struct passwd priv_pw;
+  struct passwd *pw=NSS_ARGS(args)->buf.result?(struct passwd *)NSS_ARGS(args)->buf.result:&priv_pw;
+  char *buffer=NSS_ARGS(args)->buf.buffer;
+  size_t buflen=NSS_ARGS(args)->buf.buflen;
+  char *data_ptr;
+  nss_status_t status;
+  status=_nss_nslcd_getpwent_r(pw,buffer,buflen,&errno);
+  if (status!=NSS_STATUS_SUCCESS)
+    return status;
+  if (!NSS_ARGS(args)->buf.result)
+  {
+     /* result==NULL, return file format */
+     data_ptr=(char *)malloc(buflen);
+     sprintf(data_ptr,"%s:%s:%d:%d:%s:%s:%s",
+       pw->pw_name,"x",(int) pw->pw_uid,(int) pw->pw_gid,pw->pw_gecos,
+       pw->pw_dir,pw->pw_shell);
+     /* copy file-format data to buffer provided by front-end */
+     strcpy(buffer,data_ptr);
+     if (data_ptr)
+        free(data_ptr);
+     NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.buffer;
+     NSS_ARGS(args)->returnlen=strlen(NSS_ARGS(args)->buf.buffer);
+  }
+  else
+  {
+     NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.result;
+  }
+  return status;
+}
+
+static nss_status_t _nss_ldap_passwd_destr(nss_backend_t *pw_context,void *args)
+{
+  return _nss_ldap_default_destr(pw_context,args);
+}
+
+static nss_backend_op_t passwd_ops[]={
+  _nss_ldap_passwd_destr,
+  _nss_ldap_endpwent,         /* NSS_DBOP_ENDENT */
+  _nss_ldap_setpwent,         /* NSS_DBOP_SETENT */
+  _nss_ldap_getpwent_r,       /* NSS_DBOP_GETENT */
+  _nss_ldap_getpwnam_r,       /* NSS_DBOP_PASSWD_BYNAME */
+  _nss_ldap_getpwuid_r        /* NSS_DBOP_PASSWD_BYUID */
+};
+
+nss_backend_t *_nss_ldap_passwd_constr(const char *db_name,
+                         const char *src_name,const char *cfg_args)
+{
+  nss_ldap_backend_t *be;
+  if (!(be=(nss_ldap_backend_t *)malloc(sizeof(*be))))
+    return NULL;
+  be->ops=passwd_ops;
+  be->n_ops=sizeof(passwd_ops)/sizeof(nss_backend_op_t);
+  if (_nss_ldap_default_constr(be)!=NSS_STATUS_SUCCESS)
+    return NULL;
+  return (nss_backend_t *)be;
+}
+
+#endif /* HAVE_NSSWITCH_H */
author	Arthur de Jong <arthur@arthurdejong.org>	2010-09-30 21:58:21 +0200
committer	Arthur de Jong <arthur@arthurdejong.org>	2010-09-30 21:58:21 +0200
commit	8eac6f4f55cee0a6183983f2fcd8db73dc76c8a9 (patch)
tree	c8281f14dd39c3d7460fa40fb3f002824917402d /nss/passwd.c
parent	5c0c01cfd1351cb97edd027b2b87f61a16b61281 (diff)