From c7bb19c55c7a902e25bdd33b0d49a2ddcf62e07a Mon Sep 17 00:00:00 2001 From: Arthur de Jong Date: Sat, 22 Dec 2012 21:38:26 +0000 Subject: update C coding style to a more commonly used style git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1873 ef36b2f9-881f-0410-afb5-c4e39611909c --- tests/test_myldap.c | 389 +++++++++++++++++++++++++++------------------------- 1 file changed, 203 insertions(+), 186 deletions(-) (limited to 'tests/test_myldap.c') diff --git a/tests/test_myldap.c b/tests/test_myldap.c index 5726d2e..36f6a0d 100644 --- a/tests/test_myldap.c +++ b/tests/test_myldap.c @@ -2,7 +2,7 @@ test_myldap.c - simple test for the myldap module This file is part of the nss-pam-ldapd library. - Copyright (C) 2007, 2008, 2009, 2011 Arthur de Jong + Copyright (C) 2007, 2008, 2009, 2011, 2012 Arthur de Jong This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -55,44 +55,46 @@ static void test_search(void) int rc; /* initialize session */ printf("test_myldap: test_search(): getting session...\n"); - session=myldap_create_session(); - assert(session!=NULL); + session = myldap_create_session(); + assert(session != NULL); /* perform search */ printf("test_myldap: test_search(): doing search...\n"); - search=myldap_search(session,nslcd_cfg->ldc_bases[0], - LDAP_SCOPE_SUBTREE, - "(objectclass=posixAccount)", - attrs,NULL); - assert(search!=NULL); + search = myldap_search(session, nslcd_cfg->ldc_bases[0], + LDAP_SCOPE_SUBTREE, + "(objectclass=posixAccount)", attrs, NULL); + assert(search != NULL); /* go over results */ printf("test_myldap: test_search(): get results...\n"); - for (i=0;(entry=myldap_get_entry(search,&rc))!=NULL;i++) + for (i = 0; (entry = myldap_get_entry(search, &rc)) != NULL; i++) { - if (ildc_bases[0], - LDAP_SCOPE_SUBTREE, - "(objectclass=posixGroup)", - attrs,NULL); - assert(search!=NULL); + search = myldap_search(session, nslcd_cfg->ldc_bases[0], + LDAP_SCOPE_SUBTREE, + "(objectclass=posixGroup)", attrs, NULL); + assert(search != NULL); /* go over results */ printf("test_myldap: test_search(): get results...\n"); - for (i=0;(entry=myldap_get_entry(search,&rc))!=NULL;i++) + for (i = 0; (entry = myldap_get_entry(search, &rc)) != NULL; i++) { - if (ildc_bases[0], - LDAP_SCOPE_SUBTREE, - "(&(|(objectClass=posixGroup)(objectClass=groupOfNames))(cn=testgroup2))", - attrs1,NULL); - assert(search1!=NULL); + search1 = myldap_search(session, nslcd_cfg->ldc_bases[0], + LDAP_SCOPE_SUBTREE, + "(&(|(objectClass=posixGroup)(objectClass=groupOfNames))(cn=testgroup2))", + attrs1, NULL); + assert(search1 != NULL); /* get one entry */ - entry=myldap_get_entry(search1,&rc); - assert(entry!=NULL); - printf("test_myldap: test_get(): got DN %s\n",myldap_get_dn(entry)); + entry = myldap_get_entry(search1, &rc); + assert(entry != NULL); + printf("test_myldap: test_get(): got DN %s\n", myldap_get_dn(entry)); /* get some attribute values */ - (void)myldap_get_values(entry,"gidNumber"); - (void)myldap_get_values(entry,"userPassword"); - (void)myldap_get_values(entry,"memberUid"); - (void)myldap_get_values(entry,"member"); + (void)myldap_get_values(entry, "gidNumber"); + (void)myldap_get_values(entry, "userPassword"); + (void)myldap_get_values(entry, "memberUid"); + (void)myldap_get_values(entry, "member"); /* perform another search */ printf("test_myldap: test_get(): doing get...\n"); - search2=myldap_search(session,"cn=Test User2,ou=people,dc=test,dc=tld", - LDAP_SCOPE_BASE, - "(objectclass=posixAccount)", - attrs2,NULL); - assert(search2!=NULL); + search2 = myldap_search(session, "cn=Test User2,ou=people,dc=test,dc=tld", + LDAP_SCOPE_BASE, + "(objectclass=posixAccount)", attrs2, NULL); + assert(search2 != NULL); /* get one entry */ - entry=myldap_get_entry(search2,&rc); - assert(entry!=NULL); - printf("test_myldap: test_get(): got DN %s\n",myldap_get_dn(entry)); + entry = myldap_get_entry(search2, &rc); + assert(entry != NULL); + printf("test_myldap: test_get(): got DN %s\n", myldap_get_dn(entry)); /* test if searches are ok */ - assert(myldap_get_entry(search1,&rc)==NULL); - assert(myldap_get_entry(search2,&rc)==NULL); + assert(myldap_get_entry(search1, &rc) == NULL); + assert(myldap_get_entry(search2, &rc) == NULL); /* clean up */ myldap_session_close(session); } @@ -155,45 +156,49 @@ static void test_get_values(void) int i; /* initialize session */ printf("test_myldap: test_get_values(): getting session...\n"); - session=myldap_create_session(); - assert(session!=NULL); + session = myldap_create_session(); + assert(session != NULL); /* perform search */ - search=myldap_search(session,nslcd_cfg->ldc_bases[0], - LDAP_SCOPE_SUBTREE, - "(&(objectClass=posixAccount)(uid=*))", - attrs,NULL); - assert(search!=NULL); + search = myldap_search(session, nslcd_cfg->ldc_bases[0], + LDAP_SCOPE_SUBTREE, + "(&(objectClass=posixAccount)(uid=*))", attrs, NULL); + assert(search != NULL); /* go over results */ - for (i=0;(entry=myldap_get_entry(search,NULL))!=NULL;i++) + for (i = 0; (entry = myldap_get_entry(search, NULL)) != NULL; i++) { - if (ildc_bases[0], - LDAP_SCOPE_SUBTREE, - "(&(objectClass=posixAccount)(uid=*))", - attrs,NULL); - assert(search1!=NULL); + search1 = myldap_search(session, nslcd_cfg->ldc_bases[0], + LDAP_SCOPE_SUBTREE, + "(&(objectClass=posixAccount)(uid=*))", + attrs, NULL); + assert(search1 != NULL); /* get a result from search1 */ - entry=myldap_get_entry(search1,NULL); - assert(entry!=NULL); - printf("test_myldap: test_two_searches(): [search1] DN %s\n",myldap_get_dn(entry)); - vals=myldap_get_values(entry,"cn"); - assert((vals!=NULL)&&(vals[0]!=NULL)); - printf("test_myldap: test_two_searches(): [search1] cn=%s\n",vals[0]); + entry = myldap_get_entry(search1, NULL); + assert(entry != NULL); + printf("test_myldap: test_two_searches(): [search1] DN %s\n", + myldap_get_dn(entry)); + vals = myldap_get_values(entry, "cn"); + assert((vals != NULL) && (vals[0] != NULL)); + printf("test_myldap: test_two_searches(): [search1] cn=%s\n", vals[0]); /* start a second search */ - search2=myldap_search(session,nslcd_cfg->ldc_bases[0], - LDAP_SCOPE_SUBTREE, - "(&(objectclass=posixGroup)(gidNumber=*))", - attrs,NULL); - assert(search2!=NULL); + search2 = myldap_search(session, nslcd_cfg->ldc_bases[0], + LDAP_SCOPE_SUBTREE, + "(&(objectclass=posixGroup)(gidNumber=*))", + attrs, NULL); + assert(search2 != NULL); /* get a result from search2 */ - entry=myldap_get_entry(search2,NULL); - assert(entry!=NULL); - printf("test_myldap: test_two_searches(): [search2] DN %s\n",myldap_get_dn(entry)); - vals=myldap_get_values(entry,"cn"); - assert((vals!=NULL)&&(vals[0]!=NULL)); - printf("test_myldap: test_two_searches(): [search2] cn=%s\n",vals[0]); + entry = myldap_get_entry(search2, NULL); + assert(entry != NULL); + printf("test_myldap: test_two_searches(): [search2] DN %s\n", + myldap_get_dn(entry)); + vals = myldap_get_values(entry, "cn"); + assert((vals != NULL) && (vals[0] != NULL)); + printf("test_myldap: test_two_searches(): [search2] cn=%s\n", vals[0]); /* get another result from search1 */ - entry=myldap_get_entry(search1,NULL); - assert(entry!=NULL); - printf("test_myldap: test_two_searches(): [search1] DN %s\n",myldap_get_dn(entry)); - vals=myldap_get_values(entry,"cn"); - assert((vals!=NULL)&&(vals[0]!=NULL)); - printf("test_myldap: test_two_searches(): [search1] cn=%s\n",vals[0]); + entry = myldap_get_entry(search1, NULL); + assert(entry != NULL); + printf("test_myldap: test_two_searches(): [search1] DN %s\n", + myldap_get_dn(entry)); + vals = myldap_get_values(entry, "cn"); + assert((vals != NULL) && (vals[0] != NULL)); + printf("test_myldap: test_two_searches(): [search1] cn=%s\n", vals[0]); /* stop search1 */ myldap_search_close(search1); /* get another result from search2 */ - entry=myldap_get_entry(search2,NULL); - assert(entry!=NULL); - printf("test_myldap: test_two_searches(): [search2] DN %s\n",myldap_get_dn(entry)); - vals=myldap_get_values(entry,"cn"); - assert((vals!=NULL)&&(vals[0]!=NULL)); - printf("test_myldap: test_two_searches(): [search2] cn=%s\n",vals[0]); + entry = myldap_get_entry(search2, NULL); + assert(entry != NULL); + printf("test_myldap: test_two_searches(): [search2] DN %s\n", + myldap_get_dn(entry)); + vals = myldap_get_values(entry, "cn"); + assert((vals != NULL) && (vals[0] != NULL)); + printf("test_myldap: test_two_searches(): [search2] cn=%s\n", vals[0]); /* clean up */ myldap_session_close(session); } @@ -300,28 +317,29 @@ static void *worker(void *arg) MYLDAP_SEARCH *search; MYLDAP_ENTRY *entry; const char *attrs[] = { "uid", "cn", "gid", NULL }; - struct worker_args *args=(struct worker_args *)arg; + struct worker_args *args = (struct worker_args *)arg; int i; int rc; /* initialize session */ - session=myldap_create_session(); - assert(session!=NULL); + session = myldap_create_session(); + assert(session != NULL); /* perform search */ - search=myldap_search(session,nslcd_cfg->ldc_bases[0], - LDAP_SCOPE_SUBTREE, - "(objectclass=posixAccount)", - attrs,NULL); - assert(search!=NULL); + search = myldap_search(session, nslcd_cfg->ldc_bases[0], + LDAP_SCOPE_SUBTREE, + "(objectclass=posixAccount)", attrs, NULL); + assert(search != NULL); /* go over results */ - for (i=0;(entry=myldap_get_entry(search,&rc))!=NULL;i++) + for (i = 0; (entry = myldap_get_entry(search, &rc)) != NULL; i++) { - if (iid,i,myldap_get_dn(entry)); - else if (i==MAXRESULTS) - printf("test_myldap: test_threads(): [worker %d] ...\n",args->id); + if (i < MAXRESULTS) + printf("test_myldap: test_threads(): [worker %d] [%d] DN %s\n", + args->id, i, myldap_get_dn(entry)); + else if (i == MAXRESULTS) + printf("test_myldap: test_threads(): [worker %d] ...\n", args->id); } - printf("test_myldap: test_threads(): [worker %d] DONE: %s\n",args->id,ldap_err2string(rc)); - assert(rc==LDAP_SUCCESS); + printf("test_myldap: test_threads(): [worker %d] DONE: %s\n", + args->id, ldap_err2string(rc)); + assert(rc == LDAP_SUCCESS); /* clean up */ myldap_session_close(session); return 0; @@ -336,15 +354,15 @@ static void test_threads(void) int i; struct worker_args args[NUM_THREADS]; /* start worker threads */ - for (i=0;ildc_uris[i].uri; - nslcd_cfg->ldc_uris[i].uri=NULL; + old_uris[i] = nslcd_cfg->ldc_uris[i].uri; + nslcd_cfg->ldc_uris[i].uri = NULL; } /* set new URIs */ - i=0; - nslcd_cfg->ldc_uris[i++].uri="ldapi://%2fdev%2fnull/"; - nslcd_cfg->ldc_uris[i++].uri="ldap://10.10.10.10/"; - nslcd_cfg->ldc_uris[i++].uri="ldapi://%2fdev%2fnonexistent/"; - nslcd_cfg->ldc_uris[i++].uri="ldap://nosuchhost/"; - nslcd_cfg->ldc_uris[i++].uri=NULL; + i = 0; + nslcd_cfg->ldc_uris[i++].uri = "ldapi://%2fdev%2fnull/"; + nslcd_cfg->ldc_uris[i++].uri = "ldap://10.10.10.10/"; + nslcd_cfg->ldc_uris[i++].uri = "ldapi://%2fdev%2fnonexistent/"; + nslcd_cfg->ldc_uris[i++].uri = "ldap://nosuchhost/"; + nslcd_cfg->ldc_uris[i++].uri = NULL; /* initialize session */ printf("test_myldap: test_connections(): getting session...\n"); - session=myldap_create_session(); - assert(session!=NULL); + session = myldap_create_session(); + assert(session != NULL); /* perform search */ printf("test_myldap: test_connections(): doing search...\n"); - search=myldap_search(session,nslcd_cfg->ldc_bases[0], - LDAP_SCOPE_SUBTREE, - "(objectclass=posixAccount)", - attrs,NULL); - assert(search==NULL); + search = myldap_search(session, nslcd_cfg->ldc_bases[0], + LDAP_SCOPE_SUBTREE, + "(objectclass=posixAccount)", attrs, NULL); + assert(search == NULL); /* clean up */ myldap_session_close(session); /* restore the old URIs */ - for (i=0;i<(NSS_LDAP_CONFIG_URI_MAX+1);i++) - nslcd_cfg->ldc_uris[i].uri=old_uris[i]; + for (i = 0; i < (NSS_LDAP_CONFIG_URI_MAX + 1); i++) + nslcd_cfg->ldc_uris[i].uri = old_uris[i]; } /* test whether myldap_escape() handles buffer overlows correctly */ static void test_escape(void) { char buffer[1024]; - assert(myldap_escape("test",buffer,4)!=0); - assert(myldap_escape("t*st",buffer,5)!=0); - assert(myldap_escape("t*st",buffer,20)==0); - assertstreq(buffer,"t\\2ast"); + assert(myldap_escape("test", buffer, 4) != 0); + assert(myldap_escape("t*st", buffer, 5) != 0); + assert(myldap_escape("t*st", buffer, 20) == 0); + assertstreq(buffer, "t\\2ast"); } /* the main program... */ -int main(int argc,char *argv[]) +int main(int argc, char *argv[]) { char *srcdir; char fname[100]; struct sigaction act; /* build the name of the file */ - srcdir=getenv("srcdir"); - if (srcdir==NULL) - srcdir="."; - snprintf(fname,sizeof(fname),"%s/nslcd-test.conf",srcdir); - fname[sizeof(fname)-1]='\0'; + srcdir = getenv("srcdir"); + if (srcdir == NULL) + srcdir = "."; + snprintf(fname, sizeof(fname), "%s/nslcd-test.conf", srcdir); + fname[sizeof(fname) - 1] = '\0'; /* initialize configuration */ cfg_init(fname); /* partially initialize logging */ log_setdefaultloglevel(LOG_DEBUG); /* ignore SIGPIPE */ - memset(&act,0,sizeof(struct sigaction)); - act.sa_handler=SIG_IGN; + memset(&act, 0, sizeof(struct sigaction)); + act.sa_handler = SIG_IGN; sigemptyset(&act.sa_mask); - act.sa_flags=SA_RESTART|SA_NOCLDSTOP; - assert(sigaction(SIGPIPE,&act,NULL)==0); + act.sa_flags = SA_RESTART | SA_NOCLDSTOP; + assert(sigaction(SIGPIPE, &act, NULL) == 0); /* do tests */ test_search(); test_get(); -- cgit v1.2.3