Add missing newlines to debug msgs

diff --git a/contrib/slapd-modules/nssov/alias.c b/contrib/slapd-modules/nssov/alias.c
index 7ff83034baa3e92810e8d66820eb817d67be187b..35aaa8f71d748652ef04a398c627aa0bb667558c 100644 (file)
--- a/contrib/slapd-modules/nssov/alias.c
+++ b/contrib/slapd-modules/nssov/alias.c
@@ -58,7 +58,7 @@ static int write_alias(nssov_alias_cbp *cbp,Entry *entry)
                a = attr_find(entry->e_attrs, cbp->mi->mi_attrs[0].an_desc);
                if ( !a )
                {
-                       Debug(LDAP_DEBUG_ANY,"alias entry %s does not contain %s value",
+                       Debug(LDAP_DEBUG_ANY,"alias entry %s does not contain %s value\n",
                                entry->e_name.bv_val,cbp->mi->mi_attrs[0].an_desc->ad_cname.bv_val,0 );
                        return 0;
                }
@@ -98,7 +98,7 @@ NSSOV_HANDLE(
        READ_STRING_BUF2(fp,cbp.buf,sizeof(cbp.buf));
        cbp.name.bv_len = tmpint32;
        cbp.name.bv_val = cbp.buf;,
-       Debug(LDAP_DEBUG_TRACE,"nssov_alias_byname(%s)",cbp.name.bv_val,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_alias_byname(%s)\n",cbp.name.bv_val,0,0);,
        NSLCD_ACTION_ALIAS_BYNAME,
        nssov_filter_byname(cbp.mi,0,&cbp.name,&filter)
 )
@@ -108,7 +108,7 @@ NSSOV_HANDLE(
        struct berval filter;
        /* no parameters to read */
        BER_BVZERO(&cbp.name);,
-       Debug(LDAP_DEBUG,"nssov_alias_all()",0,0,0);,
+       Debug(LDAP_DEBUG,"nssov_alias_all()\n",0,0,0);,
        NSLCD_ACTION_ALIAS_ALL,
        (filter=cbp.mi->mi_filter,0)
 )

diff --git a/contrib/slapd-modules/nssov/ether.c b/contrib/slapd-modules/nssov/ether.c
index 3055a2aaa03c47cd00d4c34d96737c96f04d54e7..9f07bbedd24fa9a6037f09300446aefbce6ed2f9 100644 (file)
--- a/contrib/slapd-modules/nssov/ether.c
+++ b/contrib/slapd-modules/nssov/ether.c
@@ -74,7 +74,7 @@ static int write_ether(nssov_ether_cbp *cbp,Entry *entry)
                a = attr_find(entry->e_attrs, cbp->mi->mi_attrs[0].an_desc);
                if ( !a )
                {
-                       Debug(LDAP_DEBUG_ANY,"ether entry %s does not contain %s value",
+                       Debug(LDAP_DEBUG_ANY,"ether entry %s does not contain %s value\n",
                                                        entry->e_name.bv_val,cbp->mi->mi_attrs[0].an_desc->ad_cname.bv_val,0 );
                        return 0;
                }
@@ -92,7 +92,7 @@ static int write_ether(nssov_ether_cbp *cbp,Entry *entry)
                a = attr_find(entry->e_attrs, cbp->mi->mi_attrs[1].an_desc);
                if ( !a )
                {
-                       Debug(LDAP_DEBUG_ANY,"ether entry %s does not contain %s value",
+                       Debug(LDAP_DEBUG_ANY,"ether entry %s does not contain %s value\n",
                                                        entry->e_name.bv_val,cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val,0 );
                        return 0;
                }
@@ -127,7 +127,7 @@ NSSOV_HANDLE(
        READ_STRING_BUF2(fp,cbp.buf,sizeof(cbp.buf));
        cbp.name.bv_len = tmpint32;
        cbp.name.bv_val = cbp.buf;,
-       Debug(LDAP_DEBUG_TRACE,"nssov_ether_byname(%s)",cbp.name.bv_val,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_ether_byname(%s)\n",cbp.name.bv_val,0,0);,
        NSLCD_ACTION_ETHER_BYNAME,
        nssov_filter_byname(cbp.mi,0,&cbp.name,&filter)
 )
@@ -148,7 +148,7 @@ NSSOV_HANDLE(
                addr.ether_addr_octet[4],
                addr.ether_addr_octet[5]);
        cbp.addr.bv_val = cbp.buf;,
-       Debug(LDAP_DEBUG_TRACE,"nssov_ether_byether(%s)",cbp.addr.bv_val,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_ether_byether(%s)\n",cbp.addr.bv_val,0,0);,
        NSLCD_ACTION_ETHER_BYETHER,
        nssov_filter_byid(cbp.mi,1,&cbp.addr,&filter)
 )
@@ -159,7 +159,7 @@ NSSOV_HANDLE(
        /* no parameters to read */
        BER_BVZERO(&cbp.name);
        BER_BVZERO(&cbp.addr);,
-       Debug(LDAP_DEBUG_TRACE,"nssov_ether_all()",0,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_ether_all()\n",0,0,0);,
        NSLCD_ACTION_ETHER_ALL,
        (filter=cbp.mi->mi_filter,0)
 )

diff --git a/contrib/slapd-modules/nssov/group.c b/contrib/slapd-modules/nssov/group.c
index 4c13acedbadd8bdccd4143cd31745564c1252c00..449cfe24d57b006dd39aaa6fc430aab36ddf5e18 100644 (file)
--- a/contrib/slapd-modules/nssov/group.c
+++ b/contrib/slapd-modules/nssov/group.c
@@ -145,7 +145,7 @@ static int write_group(nssov_group_cbp *cbp,Entry *entry)
                a = attr_find(entry->e_attrs, cbp->mi->mi_attrs[CN_KEY].an_desc);
                if ( !a )
                {
-                       Debug(LDAP_DEBUG_ANY,"group entry %s does not contain %s value",
+                       Debug(LDAP_DEBUG_ANY,"group entry %s does not contain %s value\n",
                                        entry->e_name.bv_val, cbp->mi->mi_attrs[CN_KEY].an_desc->ad_cname.bv_val,0);
                        return 0;
                }
@@ -163,7 +163,7 @@ static int write_group(nssov_group_cbp *cbp,Entry *entry)
                a = attr_find(entry->e_attrs, cbp->mi->mi_attrs[GID_KEY].an_desc);
                if ( !a )
                {
-                       Debug(LDAP_DEBUG_ANY,"group entry %s does not contain %s value",
+                       Debug(LDAP_DEBUG_ANY,"group entry %s does not contain %s value\n",
                                        entry->e_name.bv_val, cbp->mi->mi_attrs[GID_KEY].an_desc->ad_cname.bv_val,0);
                        return 0;
                }
@@ -225,7 +225,7 @@ static int write_group(nssov_group_cbp *cbp,Entry *entry)
        {
                if (!isvalidgroupname(&names[i]))
                {
-                       Debug(LDAP_DEBUG_ANY,"nssov: group entry %s contains invalid group name: \"%s\"",
+                       Debug(LDAP_DEBUG_ANY,"nssov: group entry %s contains invalid group name: \"%s\"\n",
                                                                                                        entry->e_name.bv_val,names[i].bv_val,0);
                }
                else
@@ -237,7 +237,7 @@ static int write_group(nssov_group_cbp *cbp,Entry *entry)
                                gid_t gid;
                                gid = strtol(gids[j].bv_val, &tmp, 0);
                                if ( *tmp ) {
-                                       Debug(LDAP_DEBUG_ANY,"nssov: group entry %s contains non-numeric %s value: \"%s\"",
+                                       Debug(LDAP_DEBUG_ANY,"nssov: group entry %s contains non-numeric %s value: \"%s\"\n",
                                                entry->e_name.bv_val, cbp->mi->mi_attrs[GID_KEY].an_desc->ad_cname.bv_val,
                                                names[i].bv_val);
                                        continue;
@@ -275,14 +275,14 @@ NSSOV_HANDLE(
        cbp.name.bv_len = tmpint32;
        cbp.name.bv_val = cbp.buf;
        if (!isvalidgroupname(&cbp.name)) {
-               Debug(LDAP_DEBUG_ANY,"nssov_group_byname(%s): invalid group name",cbp.name.bv_val,0,0);
+               Debug(LDAP_DEBUG_ANY,"nssov_group_byname(%s): invalid group name\n",cbp.name.bv_val,0,0);
                return -1;
        }
        cbp.wantmembers = 1;
        cbp.ni = ni;
        BER_BVZERO(&cbp.gidnum);
        BER_BVZERO(&cbp.user);,
-       Debug(LDAP_DEBUG_TRACE,"nslcd_group_byname(%s)",cbp.name.bv_val,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nslcd_group_byname(%s)\n",cbp.name.bv_val,0,0);,
        NSLCD_ACTION_GROUP_BYNAME,
        nssov_filter_byname(cbp.mi,CN_KEY,&cbp.name,&filter)
 )
@@ -300,7 +300,7 @@ NSSOV_HANDLE(
        cbp.ni = ni;
        BER_BVZERO(&cbp.name);
        BER_BVZERO(&cbp.user);,
-       Debug(LDAP_DEBUG_TRACE,"nssov_group_bygid(%s)",cbp.gidnum.bv_val,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_group_bygid(%s)\n",cbp.gidnum.bv_val,0,0);,
        NSLCD_ACTION_GROUP_BYGID,
        nssov_filter_byid(cbp.mi,GID_KEY,&cbp.gidnum,&filter)
 )
@@ -314,14 +314,14 @@ NSSOV_HANDLE(
        cbp.user.bv_len = tmpint32;
        cbp.user.bv_val = cbp.buf;
        if (!isvalidusername(&cbp.user)) {
-               Debug(LDAP_DEBUG_ANY,"nssov_group_bymember(%s): invalid user name",cbp.user.bv_val,0,0);
+               Debug(LDAP_DEBUG_ANY,"nssov_group_bymember(%s): invalid user name\n",cbp.user.bv_val,0,0);
                return -1;
        }
        cbp.wantmembers = 0;
        cbp.ni = ni;
        BER_BVZERO(&cbp.name);
        BER_BVZERO(&cbp.gidnum);,
-       Debug(LDAP_DEBUG_TRACE,"nssov_group_bymember(%s)",cbp.user.bv_val,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_group_bymember(%s)\n",cbp.user.bv_val,0,0);,
        NSLCD_ACTION_GROUP_BYMEMBER,
        mkfilter_group_bymember(&cbp,&filter)
 )
@@ -334,7 +334,7 @@ NSSOV_HANDLE(
        cbp.ni = ni;
        BER_BVZERO(&cbp.name);
        BER_BVZERO(&cbp.gidnum);,
-       Debug(LDAP_DEBUG_TRACE,"nssov_group_all()",0,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_group_all()\n",0,0,0);,
        NSLCD_ACTION_GROUP_ALL,
        (filter=cbp.mi->mi_filter,0)
 )

diff --git a/contrib/slapd-modules/nssov/host.c b/contrib/slapd-modules/nssov/host.c
index 7ccf8247bba6321c2a28a6eaecadfec96d67d458..588e28e6e6c9030ef8c0b2574184194994ffebdf 100644 (file)
--- a/contrib/slapd-modules/nssov/host.c
+++ b/contrib/slapd-modules/nssov/host.c
@@ -59,7 +59,7 @@ static int write_host(nssov_host_cbp *cbp,Entry *entry)
        a = attr_find( entry->e_attrs, cbp->mi->mi_attrs[0].an_desc );
        if ( !a || !a->a_vals )
        {
-               Debug(LDAP_DEBUG_ANY,"host entry %s does not contain %s value",
+               Debug(LDAP_DEBUG_ANY,"host entry %s does not contain %s value\n",
                        entry->e_name.bv_val, cbp->mi->mi_attrs[0].an_desc->ad_cname.bv_val, 0 );
                return 0;
        }
@@ -82,7 +82,7 @@ static int write_host(nssov_host_cbp *cbp,Entry *entry)
        a = attr_find( entry->e_attrs, cbp->mi->mi_attrs[1].an_desc );
        if ( !a || !a->a_vals )
        {
-               Debug(LDAP_DEBUG_ANY,"host entry %s does not contain %s value",
+               Debug(LDAP_DEBUG_ANY,"host entry %s does not contain %s value\n",
                        entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val, 0 );
                return 0;
        }
@@ -119,7 +119,7 @@ NSSOV_HANDLE(
        READ_STRING_BUF2(fp,cbp.buf,sizeof(cbp.buf));
        cbp.name.bv_len = tmpint32;
        cbp.name.bv_val = cbp.buf;,
-       Debug(LDAP_DEBUG_TRACE,"nssov_host_byname(%s)",cbp.name.bv_val,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_host_byname(%s)\n",cbp.name.bv_val,0,0);,
        NSLCD_ACTION_HOST_BYNAME,
        nssov_filter_byname(cbp.mi,0,&cbp.name,&filter)
 )
@@ -137,12 +137,12 @@ NSSOV_HANDLE(
        /* translate the address to a string */
        if (inet_ntop(af,addr,cbp.buf,sizeof(cbp.buf))==NULL)
        {
-               Debug(LDAP_DEBUG_ANY,"nssov: unable to convert address to string",0,0,0);
+               Debug(LDAP_DEBUG_ANY,"nssov: unable to convert address to string\n",0,0,0);
                return -1;
        }
        cbp.addr.bv_val = cbp.buf;
        cbp.addr.bv_len = strlen(cbp.buf);,
-       Debug(LDAP_DEBUG_TRACE,"nssov_host_byaddr(%s)",cbp.addr.bv_val,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_host_byaddr(%s)\n",cbp.addr.bv_val,0,0);,
        NSLCD_ACTION_HOST_BYADDR,
        nssov_filter_byid(cbp.mi,1,&cbp.addr,&filter)
 )
@@ -153,7 +153,7 @@ NSSOV_HANDLE(
        /* no parameters to read */
        BER_BVZERO(&cbp.name);
        BER_BVZERO(&cbp.addr);,
-       Debug(LDAP_DEBUG_TRACE,"nssov_host_all()",0,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_host_all()\n",0,0,0);,
        NSLCD_ACTION_HOST_ALL,
        (filter=cbp.mi->mi_filter,0)
 )

diff --git a/contrib/slapd-modules/nssov/netgroup.c b/contrib/slapd-modules/nssov/netgroup.c
index 7fe781e37a87495f29372561794e15b150b4445f..b9d95c44c17c2a59c253a2ae95aec1029c338ec7 100644 (file)
--- a/contrib/slapd-modules/nssov/netgroup.c
+++ b/contrib/slapd-modules/nssov/netgroup.c
@@ -91,7 +91,7 @@ static int write_netgroup_triple(TFILE *fp,const char *triple)
        /* we should have a bracket now */
        if (triple[i]!='(')
        {
-               Debug(LDAP_DEBUG_ANY,"write_netgroup_triple(): entry does not begin with '(' (entry skipped)",0,0,0);
+               Debug(LDAP_DEBUG_ANY,"write_netgroup_triple(): entry does not begin with '(' (entry skipped)\n",0,0,0);
                return 0;
        }
        i++;
@@ -101,7 +101,7 @@ static int write_netgroup_triple(TFILE *fp,const char *triple)
                /* nothing else to do */ ;
        if (triple[i]!=',')
        {
-               Debug(LDAP_DEBUG_ANY,"write_netgroup_triple(): missing ',' (entry skipped)",0,0,0);
+               Debug(LDAP_DEBUG_ANY,"write_netgroup_triple(): missing ',' (entry skipped)\n",0,0,0);
                return 0;
        }
        hoste=i;
@@ -112,7 +112,7 @@ static int write_netgroup_triple(TFILE *fp,const char *triple)
                /* nothing else to do */ ;
        if (triple[i]!=',')
        {
-               Debug(LDAP_DEBUG_ANY,"write_netgroup_triple(): missing ',' (entry skipped)",0,0,0);
+               Debug(LDAP_DEBUG_ANY,"write_netgroup_triple(): missing ',' (entry skipped)\n",0,0,0);
                return 0;
        }
        usere=i;
@@ -123,7 +123,7 @@ static int write_netgroup_triple(TFILE *fp,const char *triple)
                /* nothing else to do */ ;
        if (triple[i]!=')')
        {
-               Debug(LDAP_DEBUG_ANY,"write_netgroup_triple(): missing ')' (entry skipped)",0,0,0);
+               Debug(LDAP_DEBUG_ANY,"write_netgroup_triple(): missing ')' (entry skipped)\n",0,0,0);
                return 0;
        }
        domaine=i;
@@ -134,7 +134,7 @@ static int write_netgroup_triple(TFILE *fp,const char *triple)
        /* if anything is left in the string we have a problem */
        if (triple[i]!='\0')
        {
-               Debug(LDAP_DEBUG_ANY,"write_netgroup_triple(): string contains trailing data (entry skipped)",0,0,0);
+               Debug(LDAP_DEBUG_ANY,"write_netgroup_triple(): string contains trailing data (entry skipped)\n",0,0,0);
                return 0;
        }
        /* write strings */
@@ -191,7 +191,7 @@ NSSOV_HANDLE(
        READ_STRING_BUF2(fp,cbp.buf,sizeof(cbp.buf));,
        cbp.name.bv_len = tmpint32;
        cbp.name.bv_val = cbp.buf;
-       Debug(LDAP_DEBUG_TRACE,"nssov_netgroup_byname(%s)",cbp.name.bv_val,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_netgroup_byname(%s)\n",cbp.name.bv_val,0,0);,
        NSLCD_ACTION_NETGROUP_BYNAME,
        nssov_filter_byname(cbp.mi,0,&cbp.name,&filter)
 )

diff --git a/contrib/slapd-modules/nssov/network.c b/contrib/slapd-modules/nssov/network.c
index 4a6260179fac95caa01bb134853e8461aa899957..efaf8b00cac9ed3828045ca52fe571fe2caf7b3b 100644 (file)
--- a/contrib/slapd-modules/nssov/network.c
+++ b/contrib/slapd-modules/nssov/network.c
@@ -59,7 +59,7 @@ static int write_network(nssov_network_cbp *cbp,Entry *entry)
        a = attr_find( entry->e_attrs, cbp->mi->mi_attrs[0].an_desc );
        if ( !a || !a->a_vals )
        {
-               Debug(LDAP_DEBUG_ANY,"network entry %s does not contain %s value",
+               Debug(LDAP_DEBUG_ANY,"network entry %s does not contain %s value\n",
                        entry->e_name.bv_val,cbp->mi->mi_attrs[0].an_desc->ad_cname.bv_val,0);
                return 0;
        }
@@ -82,7 +82,7 @@ static int write_network(nssov_network_cbp *cbp,Entry *entry)
        a = attr_find( entry->e_attrs, cbp->mi->mi_attrs[1].an_desc );
        if ( !a || !a->a_vals )
        {
-               Debug(LDAP_DEBUG_ANY,"network entry %s does not contain %s value",
+               Debug(LDAP_DEBUG_ANY,"network entry %s does not contain %s value\n",
                        entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val, 0 );
                return 0;
        }
@@ -119,7 +119,7 @@ NSSOV_HANDLE(
        READ_STRING_BUF2(fp,cbp.buf,sizeof(cbp.buf));
        cbp.name.bv_len = tmpint32;
        cbp.name.bv_val = cbp.buf;,
-       Debug(LDAP_DEBUG_TRACE,"nssov_network_byname(%s)",cbp.name.bv_val,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_network_byname(%s)\n",cbp.name.bv_val,0,0);,
        NSLCD_ACTION_NETWORK_BYNAME,
        nssov_filter_byname(cbp.mi,0,&cbp.name,&filter)
 )
@@ -137,12 +137,12 @@ NSSOV_HANDLE(
        /* translate the address to a string */
        if (inet_ntop(af,addr,cbp.buf,sizeof(cbp.buf))==NULL)
        {
-               Debug(LDAP_DEBUG_ANY,"nssov: unable to convert address to string",0,0,0);
+               Debug(LDAP_DEBUG_ANY,"nssov: unable to convert address to string\n",0,0,0);
                return -1;
        }
        cbp.addr.bv_val = cbp.buf;
        cbp.addr.bv_len = strlen(cbp.buf);,
-       Debug(LDAP_DEBUG_TRACE,"nslcd_network_byaddr(%s)",cbp.addr.bv_val,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nslcd_network_byaddr(%s)\n",cbp.addr.bv_val,0,0);,
        NSLCD_ACTION_NETWORK_BYADDR,
        nssov_filter_byid(cbp.mi,1,&cbp.addr,&filter)
 )
@@ -153,7 +153,7 @@ NSSOV_HANDLE(
        /* no parameters to read */
        BER_BVZERO(&cbp.name);
        BER_BVZERO(&cbp.addr);,
-       Debug(LDAP_DEBUG_TRACE,"nssov_network_all()",0,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_network_all()\n",0,0,0);,
        NSLCD_ACTION_NETWORK_ALL,
        (filter=cbp.mi->mi_filter,0)
 )

diff --git a/contrib/slapd-modules/nssov/nssov.c b/contrib/slapd-modules/nssov/nssov.c
index 9e4d6fead3e5407810b5e1ccc7290d3d4a366a17..10f6178e83a777dcd3e08e3e9a82cb93467709d3 100644 (file)
--- a/contrib/slapd-modules/nssov/nssov.c
+++ b/contrib/slapd-modules/nssov/nssov.c
@@ -152,7 +152,7 @@ int write_address(TFILE *fp,struct berval *addr)
                /* failure, log but write simple invalid address
                         (otherwise the address list is messed up) */
                /* TODO: have error message in correct format */
-               Debug(LDAP_DEBUG_ANY,"nssov: unparseable address: %s",addr->bv_val,0,0);
+               Debug(LDAP_DEBUG_ANY,"nssov: unparseable address: %s\n",addr->bv_val,0,0);
                /* write an illegal address type */
                WRITE_INT32(fp,-1);
                /* write an empty address */
@@ -170,14 +170,14 @@ int read_address(TFILE *fp,char *addr,int *addrlen,int *af)
        READ_INT32(fp,*af);
        if ((*af!=AF_INET)&&(*af!=AF_INET6))
        {
-               Debug(LDAP_DEBUG_ANY,"nssov: incorrect address family specified: %d",*af,0,0);
+               Debug(LDAP_DEBUG_ANY,"nssov: incorrect address family specified: %d\n",*af,0,0);
                return -1;
        }
        /* read address length */
        READ_INT32(fp,len);
        if ((len>*addrlen)||(len<=0))
        {
-               Debug(LDAP_DEBUG_ANY,"nssov: address length incorrect: %d",len,0,0);
+               Debug(LDAP_DEBUG_ANY,"nssov: address length incorrect: %d\n",len,0,0);
                return -1;
        }
        *addrlen=len;
@@ -237,7 +237,7 @@ static int read_header(TFILE *fp,int32_t *action)
   READ_TYPE(fp,tmpint32,int32_t);
   if (tmpint32 != (int32_t)NSLCD_VERSION)
   {
-    Debug( LDAP_DEBUG_TRACE,"nssov: wrong nslcd version id (%d)",(int)tmpint32,0,0);
+    Debug( LDAP_DEBUG_TRACE,"nssov: wrong nslcd version id (%d)\n",(int)tmpint32,0,0);
     return -1;
   }
   /* read the request type */
@@ -258,9 +258,9 @@ static void handleconnection(nssov_info *ni,int sock,Operation *op)
 
   /* log connection */
   if (lutil_getpeereid(sock,&uid,&gid))
-    Debug( LDAP_DEBUG_TRACE,"nssov: connection from unknown client: %s",strerror(errno),0,0);
+    Debug( LDAP_DEBUG_TRACE,"nssov: connection from unknown client: %s\n",strerror(errno),0,0);
   else
-    Debug( LDAP_DEBUG_TRACE,"nssov: connection from uid=%d gid=%d",
+    Debug( LDAP_DEBUG_TRACE,"nssov: connection from uid=%d gid=%d\n",
                       (int)uid,(int)gid,0);
 
   /* Should do authid mapping too */
@@ -322,6 +322,11 @@ static void handleconnection(nssov_info *ni,int sock,Operation *op)
     case NSLCD_ACTION_SERVICE_ALL:      (void)nssov_service_all(ni,fp,op); break;
     case NSLCD_ACTION_SHADOW_BYNAME:    if (uid==0) (void)nssov_shadow_byname(ni,fp,op); break;
     case NSLCD_ACTION_SHADOW_ALL:       if (uid==0) (void)nssov_shadow_all(ni,fp,op); break;
+       case NSLCD_ACTION_PAM_AUTHC:            (void)pam_authc(ni,fp,op); break;
+       case NSLCD_ACTION_PAM_AUTHZ:            (void)pam_authz(ni,fp,op); break;
+       case NSLCD_ACTION_PAM_SESS_O:           (void)pam_sess_o(ni,fp,op); break;
+       case NSLCD_ACTION_PAM_SESS_C:           (void)pam_sess_c(ni,fp,op); break;
+       case NSLCD_ACTION_PAM_PWMOD:            (void)pam_pwmod(ni,fp,op); break;
     default:
       Debug( LDAP_DEBUG_ANY,"nssov: invalid request id: %d",(int)action,0,0);
       break;

diff --git a/contrib/slapd-modules/nssov/passwd.c b/contrib/slapd-modules/nssov/passwd.c
index 4897ac286b52cb00491d1af7184a4bf7e7e98a71..31fb88e73b158dbb1cdf26758700b842c1881f91 100644 (file)
--- a/contrib/slapd-modules/nssov/passwd.c
+++ b/contrib/slapd-modules/nssov/passwd.c
@@ -223,7 +223,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;
                }
@@ -264,7 +264,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;
                }
@@ -280,19 +280,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;
        }
@@ -302,7 +302,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);
@@ -310,7 +310,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);
@@ -320,7 +320,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;
        }
@@ -328,7 +328,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];
@@ -345,7 +345,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];
@@ -357,7 +357,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
@@ -368,7 +368,7 @@ 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;
@@ -398,11 +398,11 @@ NSSOV_HANDLE(
        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)
 )
@@ -417,7 +417,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)
 )
@@ -428,7 +428,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)
 )

diff --git a/contrib/slapd-modules/nssov/protocol.c b/contrib/slapd-modules/nssov/protocol.c
index 54a176bc2d2993a672a552ee9c22737b4fb2ce03..6e6e5b8b8b6661edd28534bf28dbad1650c28717 100644 (file)
--- a/contrib/slapd-modules/nssov/protocol.c
+++ b/contrib/slapd-modules/nssov/protocol.c
@@ -59,7 +59,7 @@ static int write_protocol(nssov_protocol_cbp *cbp,Entry *entry)
        a = attr_find( entry->e_attrs, cbp->mi->mi_attrs[0].an_desc );
        if ( !a || !a->a_vals )
        {
-               Debug(LDAP_DEBUG_ANY,"protocol entry %s does not contain %s value",
+               Debug(LDAP_DEBUG_ANY,"protocol entry %s does not contain %s value\n",
                        entry->e_name.bv_val, cbp->mi->mi_attrs[0].an_desc->ad_cname.bv_val, 0 );
                return 0;
        }
@@ -82,17 +82,17 @@ static int write_protocol(nssov_protocol_cbp *cbp,Entry *entry)
        a = attr_find( entry->e_attrs, cbp->mi->mi_attrs[1].an_desc );
        if ( !a || !a->a_vals )
        {
-               Debug(LDAP_DEBUG_ANY,"protocol entry %s does not contain %s value",
+               Debug(LDAP_DEBUG_ANY,"protocol entry %s does not contain %s value\n",
                        entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val, 0 );
                return 0;
        } else if ( a->a_numvals > 1 ) {
-               Debug(LDAP_DEBUG_ANY,"protocol entry %s contains multiple %s values",
+               Debug(LDAP_DEBUG_ANY,"protocol entry %s contains multiple %s values\n",
                        entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val, 0 );
        }
        proto=(int)strtol(a->a_vals[0].bv_val,&tmp,0);
        if (*tmp)
        {
-               Debug(LDAP_DEBUG_ANY,"protocol entry %s contains non-numeric %s value",
+               Debug(LDAP_DEBUG_ANY,"protocol entry %s contains non-numeric %s value\n",
                        entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val, 0 );
                return 0;
        }
@@ -123,7 +123,7 @@ NSSOV_HANDLE(
        READ_STRING_BUF2(fp,cbp.buf,sizeof(cbp.buf));
        cbp.name.bv_len = tmpint32;
        cbp.name.bv_val = cbp.buf;,
-       Debug(LDAP_DEBUG_TRACE,"nssov_protocol_byname(%s)",cbp.name.bv_val,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_protocol_byname(%s)\n",cbp.name.bv_val,0,0);,
        NSLCD_ACTION_PROTOCOL_BYNAME,
        nssov_filter_byname(cbp.mi,0,&cbp.name,&filter)
 )
@@ -138,7 +138,7 @@ NSSOV_HANDLE(
        cbp.numb.bv_val = cbp.buf;
        cbp.numb.bv_len = snprintf(cbp.buf,sizeof(cbp.buf),"%d",protocol);
        BER_BVZERO(&cbp.name);,
-       Debug(LDAP_DEBUG_TRACE,"nssov_protocol_bynumber(%s)",cbp.numb.bv_val,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_protocol_bynumber(%s)\n",cbp.numb.bv_val,0,0);,
        NSLCD_ACTION_PROTOCOL_BYNUMBER,
        nssov_filter_byid(cbp.mi,1,&cbp.numb,&filter)
 )
@@ -147,7 +147,7 @@ NSSOV_HANDLE(
        protocol,all,
        struct berval filter;
        /* no parameters to read */,
-       Debug(LDAP_DEBUG_TRACE,"nssov_protocol_all()",0,0,0);,
+       Debug(LDAP_DEBUG_TRACE,"nssov_protocol_all()\n",0,0,0);,
        NSLCD_ACTION_PROTOCOL_ALL,
        (filter=cbp.mi->mi_filter,0)
 )