From 016500f41dc1f87a69997f3ce5d4fbd25ac1c593 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Fri, 17 Apr 2009 12:10:27 +0000 Subject: [PATCH] Add missing newlines to debug msgs --- contrib/slapd-modules/nssov/rpc.c | 14 +++++++------- contrib/slapd-modules/nssov/service.c | 16 ++++++++-------- contrib/slapd-modules/nssov/shadow.c | 16 ++++++++-------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/contrib/slapd-modules/nssov/rpc.c b/contrib/slapd-modules/nssov/rpc.c index 63bde46802..b86d913180 100644 --- a/contrib/slapd-modules/nssov/rpc.c +++ b/contrib/slapd-modules/nssov/rpc.c @@ -62,7 +62,7 @@ static int write_rpc(nssov_rpc_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,"rpc entry %s does not contain %s value", + Debug(LDAP_DEBUG_ANY,"rpc 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; } @@ -85,17 +85,17 @@ static int write_rpc(nssov_rpc_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,"rpc entry %s does not contain %s value", + Debug(LDAP_DEBUG_ANY,"rpc 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,"rpc entry %s contains multiple %s values", + Debug(LDAP_DEBUG_ANY,"rpc entry %s contains multiple %s values\n", entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val, 0 ); } number=(int)strtol(a->a_vals[0].bv_val,&tmp,0); if (*tmp) { - Debug(LDAP_DEBUG_ANY,"rpc entry %s contains non-numeric %s value", + Debug(LDAP_DEBUG_ANY,"rpc 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; } @@ -126,7 +126,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_rpc_byname(%s)",cbp.name.bv_val,0,0);, + Debug(LDAP_DEBUG_TRACE,"nssov_rpc_byname(%s)\n",cbp.name.bv_val,0,0);, NSLCD_ACTION_RPC_BYNAME, nssov_filter_byname(cbp.mi,0,&cbp.name,&filter) ) @@ -141,7 +141,7 @@ NSSOV_HANDLE( cbp.numb.bv_val = cbp.buf; cbp.numb.bv_len = snprintf(cbp.buf,sizeof(cbp.buf),"%d",number); BER_BVZERO(&cbp.name);, - Debug(LDAP_DEBUG_TRACE,"nssov_rpc_bynumber(%s)",cbp.numb.bv_val,0,0);, + Debug(LDAP_DEBUG_TRACE,"nssov_rpc_bynumber(%s)\n",cbp.numb.bv_val,0,0);, NSLCD_ACTION_RPC_BYNUMBER, nssov_filter_byid(cbp.mi,1,&cbp.numb,&filter) ) @@ -150,7 +150,7 @@ NSSOV_HANDLE( rpc,all, struct berval filter; /* no parameters to read */, - Debug(LDAP_DEBUG_TRACE,"nssov_rpc_all()",0,0,0);, + Debug(LDAP_DEBUG_TRACE,"nssov_rpc_all()\n",0,0,0);, NSLCD_ACTION_RPC_ALL, (filter=cbp.mi->mi_filter,0) ) diff --git a/contrib/slapd-modules/nssov/service.c b/contrib/slapd-modules/nssov/service.c index ceaf901187..ac5390a180 100644 --- a/contrib/slapd-modules/nssov/service.c +++ b/contrib/slapd-modules/nssov/service.c @@ -124,7 +124,7 @@ static int write_service(nssov_service_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,"service entry %s does not contain %s value", + Debug(LDAP_DEBUG_ANY,"service 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; } @@ -147,17 +147,17 @@ static int write_service(nssov_service_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,"service entry %s does not contain %s value", + Debug(LDAP_DEBUG_ANY,"service 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,"service entry %s contains multiple %s values", + Debug(LDAP_DEBUG_ANY,"service entry %s contains multiple %s values\n", entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val, 0 ); } port=(int)strtol(a->a_vals[0].bv_val,&tmp,0); if (*tmp) { - Debug(LDAP_DEBUG_ANY,"service entry %s contains non-numeric %s value", + Debug(LDAP_DEBUG_ANY,"service 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; } @@ -167,7 +167,7 @@ static int write_service(nssov_service_cbp *cbp,Entry *entry) a = attr_find( entry->e_attrs, cbp->mi->mi_attrs[2].an_desc ); if ( !a || !a->a_vals ) { - Debug(LDAP_DEBUG_ANY,"service entry %s does not contain %s value", + Debug(LDAP_DEBUG_ANY,"service entry %s does not contain %s value\n", entry->e_name.bv_val, cbp->mi->mi_attrs[2].an_desc->ad_cname.bv_val, 0 ); return 0; } @@ -215,7 +215,7 @@ NSSOV_HANDLE( READ_STRING_BUF2(fp,cbp.pbuf,sizeof(cbp.pbuf)); cbp.prot.bv_len = tmpint32; cbp.prot.bv_val = tmpint32 ? cbp.pbuf : NULL;, - Debug(LDAP_DEBUG_TRACE,"nssov_service_byname(%s,%s)",cbp.name.bv_val,cbp.prot.bv_val,0);, + Debug(LDAP_DEBUG_TRACE,"nssov_service_byname(%s,%s)\n",cbp.name.bv_val,cbp.prot.bv_val,0);, NSLCD_ACTION_SERVICE_BYNAME, mkfilter_service_byname(cbp.mi,&cbp.name,&cbp.prot,&filter) ) @@ -232,7 +232,7 @@ NSSOV_HANDLE( READ_STRING_BUF2(fp,cbp.pbuf,sizeof(cbp.pbuf)); cbp.prot.bv_len = tmpint32; cbp.prot.bv_val = tmpint32 ? cbp.pbuf : NULL;, - Debug(LDAP_DEBUG_TRACE,"nssov_service_bynumber(%s,%s)",cbp.name.bv_val,cbp.prot.bv_val,0);, + Debug(LDAP_DEBUG_TRACE,"nssov_service_bynumber(%s,%s)\n",cbp.name.bv_val,cbp.prot.bv_val,0);, NSLCD_ACTION_SERVICE_BYNUMBER, mkfilter_service_bynumber(cbp.mi,&cbp.name,&cbp.prot,&filter) ) @@ -242,7 +242,7 @@ NSSOV_HANDLE( struct berval filter; /* no parameters to read */ BER_BVZERO(&cbp.prot);, - Debug(LDAP_DEBUG_TRACE,"nssov_service_all()",0,0,0);, + Debug(LDAP_DEBUG_TRACE,"nssov_service_all()\n",0,0,0);, NSLCD_ACTION_SERVICE_ALL, (filter=cbp.mi->mi_filter,0) ) diff --git a/contrib/slapd-modules/nssov/shadow.c b/contrib/slapd-modules/nssov/shadow.c index 49fd6fbd3f..f331e59cd1 100644 --- a/contrib/slapd-modules/nssov/shadow.c +++ b/contrib/slapd-modules/nssov/shadow.c @@ -91,7 +91,7 @@ static long to_date(struct berval *date,AttributeDescription *attr) value=strtol(buffer,&tmp,0); if ((buffer[0]=='\0')||(*tmp!='\0')) { - Debug(LDAP_DEBUG_ANY,"shadow entry contains non-numeric %s value", + Debug(LDAP_DEBUG_ANY,"shadow entry contains non-numeric %s value\n", attr->ad_cname.bv_val,0,0); return 0; } @@ -102,7 +102,7 @@ static long to_date(struct berval *date,AttributeDescription *attr) value=strtol(date->bv_val,&tmp,0); if ((date->bv_val[0]=='\0')||(*tmp!='\0')) { - Debug(LDAP_DEBUG_ANY,"shadow entry contains non-numeric %s value", + Debug(LDAP_DEBUG_ANY,"shadow entry contains non-numeric %s value\n", attr->ad_cname.bv_val,0,0); return 0; } @@ -121,13 +121,13 @@ static long to_date(struct berval *date,AttributeDescription *attr) { \ if (a->a_numvals > 1) \ { \ - Debug(LDAP_DEBUG_ANY,"shadow entry %s contains multiple %s values", \ + Debug(LDAP_DEBUG_ANY,"shadow entry %s contains multiple %s values\n", \ entry->e_name.bv_val, cbp->mi->mi_attrs[key].an_desc->ad_cname.bv_val,0); \ } \ var=strtol(a->a_vals[0].bv_val,&tmp,0); \ if ((a->a_vals[0].bv_val[0]=='\0')||(*tmp!='\0')) \ { \ - Debug(LDAP_DEBUG_ANY,"shadow entry %s contains non-numeric %s value", \ + Debug(LDAP_DEBUG_ANY,"shadow entry %s contains non-numeric %s value\n", \ entry->e_name.bv_val, cbp->mi->mi_attrs[key].an_desc->ad_cname.bv_val,0); \ return 0; \ } \ @@ -141,7 +141,7 @@ static long to_date(struct berval *date,AttributeDescription *attr) { \ if (a->a_numvals > 1) \ { \ - Debug(LDAP_DEBUG_ANY,"shadow entry %s contains multiple %s values", \ + Debug(LDAP_DEBUG_ANY,"shadow entry %s contains multiple %s values\n", \ entry->e_name.bv_val, cbp->mi->mi_attrs[key].an_desc->ad_cname.bv_val,0); \ } \ var=to_date(&a->a_vals[0],cbp->mi->mi_attrs[key].an_desc); \ @@ -173,7 +173,7 @@ static int write_shadow(nssov_shadow_cbp *cbp,Entry *entry) a = attr_find(entry->e_attrs, cbp->mi->mi_attrs[UID_KEY].an_desc); if (!a) { - Debug(LDAP_DEBUG_ANY,"shadow entry %s does not contain %s value", + Debug(LDAP_DEBUG_ANY,"shadow 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; } @@ -239,7 +239,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_ANY,"nssov_shadow_byname(%s)",cbp.name.bv_val,0,0);, + Debug(LDAP_DEBUG_ANY,"nssov_shadow_byname(%s)\n",cbp.name.bv_val,0,0);, NSLCD_ACTION_SHADOW_BYNAME, nssov_filter_byname(cbp.mi,UID_KEY,&cbp.name,&filter) ) @@ -249,7 +249,7 @@ NSSOV_HANDLE( struct berval filter; /* no parameters to read */ BER_BVZERO(&cbp.name);, - Debug(LDAP_DEBUG_ANY,"nssov_shadow_all()",0,0,0);, + Debug(LDAP_DEBUG_ANY,"nssov_shadow_all()\n",0,0,0);, NSLCD_ACTION_SHADOW_ALL, (filter=cbp.mi->mi_filter,0) ) -- 2.39.5