Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / contrib / slapd-modules / nssov / passwd.c

diff --git a/contrib/slapd-modules/nssov/passwd.c b/contrib/slapd-modules/nssov/passwd.c
index 41a53f8ff9df078bf349fe26824b424e1dea6d80..7c4f95b5eb5ceeace599f3453218aac5fe54f9d6 100644 (file)
--- a/contrib/slapd-modules/nssov/passwd.c
+++ b/contrib/slapd-modules/nssov/passwd.c
@@ -1,7 +1,9 @@
 /* passwd.c - password lookup routines */
 /* $OpenLDAP$ */
-/*
- * Copyright 2008 by Howard Chu, Symas Corp.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>. 
+ *
+ * Copyright 2008-2013 The OpenLDAP Foundation.
+ * Portions Copyright 2008 by Howard Chu, Symas Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -12,7 +14,7 @@
  * top-level directory of the distribution or, alternatively, at
  * <http://www.OpenLDAP.org/license.html>.
  */
-/*
+/* ACKNOWLEDGEMENTS:
  * This code references portions of the nss-ldapd package
  * written by Arthur de Jong. The nss-ldapd code was forked
  * from the nss-ldap library written by Luke Howard.
@@ -143,7 +145,7 @@ int nssov_dn2uid(Operation *op,nssov_info *ni,struct berval *dn,struct berval *u
        return 0;
 }
 
-static int uid2dn_cb(Operation *op,SlapReply *rs)
+int nssov_name2dn_cb(Operation *op,SlapReply *rs)
 {
        if ( rs->sr_type == REP_SEARCH )
        {
@@ -172,10 +174,10 @@ int nssov_uid2dn(Operation *op,nssov_info *ni,struct berval *uid,struct berval *
        if (!isvalidusername(uid))
                return 0;
        /* we have to look up the entry */
-       nssov_filter_byid(mi,UIDN_KEY,uid,&filter);
+       nssov_filter_byid(mi,UID_KEY,uid,&filter);
        BER_BVZERO(dn);
        cb.sc_private = dn;
-       cb.sc_response = uid2dn_cb;
+       cb.sc_response = nssov_name2dn_cb;
        op2 = *op;
        op2.o_callback = &cb;
        op2.o_req_dn = mi->mi_base;
@@ -184,9 +186,11 @@ int nssov_uid2dn(Operation *op,nssov_info *ni,struct berval *uid,struct berval *
        op2.ors_filterstr = filter;
        op2.ors_filter = str2filter_x( op, filter.bv_val );
        op2.ors_attrs = slap_anlist_no_attrs;
+       op2.ors_tlimit = SLAP_NO_LIMIT;
+       op2.ors_slimit = SLAP_NO_LIMIT;
        rc = op2.o_bd->be_search( &op2, &rs );
        filter_free_x( op, op2.ors_filter, 1 );
-       return rc == LDAP_SUCCESS;
+       return rc == LDAP_SUCCESS && !BER_BVISNULL(dn);
 }
 
 /* the maximum number of uidNumber attributes per entry */
@@ -221,7 +225,7 @@ static int write_passwd(nssov_passwd_cbp *cbp,Entry *entry)
                a = attr_find(entry->e_attrs, cbp->mi->mi_attrs[UID_KEY].an_desc);
                if (!a)
                {
-                       Debug(LDAP_DEBUG_ANY,"passwd entry %s does not contain %s value",
+                       Debug(LDAP_DEBUG_ANY,"passwd entry %s does not contain %s value\n",
                                entry->e_name.bv_val, cbp->mi->mi_attrs[UID_KEY].an_desc->ad_cname.bv_val,0);
                        return 0;
                }
@@ -262,7 +266,7 @@ static int write_passwd(nssov_passwd_cbp *cbp,Entry *entry)
                a = attr_find(entry->e_attrs, cbp->mi->mi_attrs[UIDN_KEY].an_desc);
         if ( !a )
                {
-                       Debug(LDAP_DEBUG_ANY,"passwd entry %s does not contain %s value",
+                       Debug(LDAP_DEBUG_ANY,"passwd entry %s does not contain %s value\n",
                                entry->e_name.bv_val, cbp->mi->mi_attrs[UIDN_KEY].an_desc->ad_cname.bv_val,0);
                        return 0;
                }
@@ -278,19 +282,19 @@ static int write_passwd(nssov_passwd_cbp *cbp,Entry *entry)
        a = attr_find(entry->e_attrs, cbp->mi->mi_attrs[GIDN_KEY].an_desc);
        if (!a)
        {
-               Debug(LDAP_DEBUG_ANY,"passwd entry %s does not contain %s value",
+               Debug(LDAP_DEBUG_ANY,"passwd entry %s does not contain %s value\n",
                        entry->e_name.bv_val, cbp->mi->mi_attrs[GIDN_KEY].an_desc->ad_cname.bv_val,0);
                return 0;
        }
        else if (a->a_numvals != 1)
        {
-               Debug(LDAP_DEBUG_ANY,"passwd entry %s contains multiple %s values",
+               Debug(LDAP_DEBUG_ANY,"passwd entry %s contains multiple %s values\n",
                        entry->e_name.bv_val, cbp->mi->mi_attrs[GIDN_KEY].an_desc->ad_cname.bv_val,0);
        }
        gid=(gid_t)strtol(a->a_vals[0].bv_val,&tmp,0);
        if ((a->a_vals[0].bv_val[0]=='\0')||(*tmp!='\0'))
        {
-               Debug(LDAP_DEBUG_ANY,"passwd entry %s contains non-numeric %s value",
+               Debug(LDAP_DEBUG_ANY,"passwd entry %s contains non-numeric %s value\n",
                        entry->e_name.bv_val, cbp->mi->mi_attrs[GIDN_KEY].an_desc->ad_cname.bv_val,0);
                return 0;
        }
@@ -300,7 +304,7 @@ static int write_passwd(nssov_passwd_cbp *cbp,Entry *entry)
                a = attr_find(entry->e_attrs, cbp->mi->mi_attrs[CN_KEY].an_desc);
        if (!a || !a->a_numvals)
        {
-               Debug(LDAP_DEBUG_ANY,"passwd entry %s does not contain %s or %s value",
+               Debug(LDAP_DEBUG_ANY,"passwd entry %s does not contain %s or %s value\n",
                        entry->e_name.bv_val,
                        cbp->mi->mi_attrs[GEC_KEY].an_desc->ad_cname.bv_val,
                        cbp->mi->mi_attrs[CN_KEY].an_desc->ad_cname.bv_val);
@@ -308,7 +312,7 @@ static int write_passwd(nssov_passwd_cbp *cbp,Entry *entry)
        }
        else if (a->a_numvals > 1)
        {
-               Debug(LDAP_DEBUG_ANY,"passwd entry %s contains multiple %s or %s values",
+               Debug(LDAP_DEBUG_ANY,"passwd entry %s contains multiple %s or %s values\n",
                        entry->e_name.bv_val,
                        cbp->mi->mi_attrs[GEC_KEY].an_desc->ad_cname.bv_val,
                        cbp->mi->mi_attrs[CN_KEY].an_desc->ad_cname.bv_val);
@@ -318,7 +322,7 @@ static int write_passwd(nssov_passwd_cbp *cbp,Entry *entry)
        a = attr_find(entry->e_attrs, cbp->mi->mi_attrs[DIR_KEY].an_desc);
        if (!a)
        {
-               Debug(LDAP_DEBUG_ANY,"passwd entry %s does not contain %s value",
+               Debug(LDAP_DEBUG_ANY,"passwd entry %s does not contain %s value\n",
                        entry->e_name.bv_val, cbp->mi->mi_attrs[DIR_KEY].an_desc->ad_cname.bv_val,0);
                homedir=default_passwd_homeDirectory;
        }
@@ -326,7 +330,7 @@ static int write_passwd(nssov_passwd_cbp *cbp,Entry *entry)
        {
                if (a->a_numvals > 1)
                {
-                       Debug(LDAP_DEBUG_ANY,"passwd entry %s contains multiple %s values",
+                       Debug(LDAP_DEBUG_ANY,"passwd entry %s contains multiple %s values\n",
                                entry->e_name.bv_val, cbp->mi->mi_attrs[DIR_KEY].an_desc->ad_cname.bv_val,0);
                }
                homedir=a->a_vals[0];
@@ -343,7 +347,7 @@ static int write_passwd(nssov_passwd_cbp *cbp,Entry *entry)
        {
                if (a->a_numvals > 1)
                {
-                       Debug(LDAP_DEBUG_ANY,"passwd entry %s contains multiple %s values",
+                       Debug(LDAP_DEBUG_ANY,"passwd entry %s contains multiple %s values\n",
                                entry->e_name.bv_val, cbp->mi->mi_attrs[SHL_KEY].an_desc->ad_cname.bv_val,0);
                }
                shell=a->a_vals[0];
@@ -355,7 +359,7 @@ static int write_passwd(nssov_passwd_cbp *cbp,Entry *entry)
        {
                if (!isvalidusername(&names[i]))
                {
-                       Debug(LDAP_DEBUG_ANY,"nssov: passwd entry %s contains invalid user name: \"%s\"",
+                       Debug(LDAP_DEBUG_ANY,"nssov: passwd entry %s contains invalid user name: \"%s\"\n",
                                entry->e_name.bv_val,names[i].bv_val,0);
                }
                else
@@ -366,12 +370,12 @@ static int write_passwd(nssov_passwd_cbp *cbp,Entry *entry)
                                uid_t uid;
                                uid = strtol(uids[j].bv_val, &tmp, 0);
                                if ( *tmp ) {
-                                       Debug(LDAP_DEBUG_ANY,"nssov: passwd entry %s contains non-numeric %s value: \"%s\"",
+                                       Debug(LDAP_DEBUG_ANY,"nssov: passwd entry %s contains non-numeric %s value: \"%s\"\n",
                                                entry->e_name.bv_val, cbp->mi->mi_attrs[UIDN_KEY].an_desc->ad_cname.bv_val,
                                                names[i].bv_val);
                                        continue;
                                }
-                               WRITE_INT32(cbp->fp,NSLCD_RESULT_SUCCESS);
+                               WRITE_INT32(cbp->fp,NSLCD_RESULT_BEGIN);
                                WRITE_BERVAL(cbp->fp,&names[i]);
                                WRITE_BERVAL(cbp->fp,&passwd);
                                WRITE_TYPE(cbp->fp,uid,uid_t);
@@ -392,15 +396,15 @@ NSSOV_HANDLE(
        char fbuf[1024];
        struct berval filter = {sizeof(fbuf)};
        filter.bv_val = fbuf;
-       READ_STRING_BUF2(fp,cbp.buf,sizeof(cbp.buf));
+       READ_STRING(fp,cbp.buf);
        cbp.name.bv_len = tmpint32;
        cbp.name.bv_val = cbp.buf;
        if (!isvalidusername(&cbp.name)) {
-               Debug(LDAP_DEBUG_ANY,"nssov_passwd_byname(%s): invalid user name",cbp.name.bv_val,0,0);
+               Debug(LDAP_DEBUG_ANY,"nssov_passwd_byname(%s): invalid user name\n",cbp.name.bv_val,0,0);
                return -1;
        }
        BER_BVZERO(&cbp.id); ,
-       Debug(LDAP_DEBUG_TRACE,"nssov_passwd_byname(%s)",cbp.name.bv_val,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_passwd_byname(%s)\n",cbp.name.bv_val,0,0);,
        NSLCD_ACTION_PASSWD_BYNAME,
        nssov_filter_byname(cbp.mi,UID_KEY,&cbp.name,&filter)
 )
@@ -415,7 +419,7 @@ NSSOV_HANDLE(
        cbp.id.bv_val = cbp.buf;
        cbp.id.bv_len = snprintf(cbp.buf,sizeof(cbp.buf),"%d",uid);
        BER_BVZERO(&cbp.name);,
-       Debug(LDAP_DEBUG_TRACE,"nssov_passwd_byuid(%s)",cbp.id.bv_val,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_passwd_byuid(%s)\n",cbp.id.bv_val,0,0);,
        NSLCD_ACTION_PASSWD_BYUID,
        nssov_filter_byid(cbp.mi,UIDN_KEY,&cbp.id,&filter)
 )
@@ -426,7 +430,7 @@ NSSOV_HANDLE(
        /* no parameters to read */
        BER_BVZERO(&cbp.name);
        BER_BVZERO(&cbp.id);,
-       Debug(LDAP_DEBUG_TRACE,"nssov_passwd_all()",0,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_passwd_all()\n",0,0,0);,
        NSLCD_ACTION_PASSWD_ALL,
        (filter=cbp.mi->mi_filter,0)
 )