diff options
| author | David Sommerseth <dazo@users.sourceforge.net> | 2008-12-15 11:21:12 +0100 |
|---|---|---|
| committer | David Sommerseth <dazo@users.sourceforge.net> | 2008-12-15 11:21:12 +0100 |
| commit | c9637d0500489e0d22e51faef2fd0df6c74391c9 (patch) | |
| tree | 869fd3a1377532fbac93b45fb89f77a0b85bfd2d /eurephiadm | |
| parent | 2844daafcf5740e62960a54f19009dd1eb44b5c2 (diff) | |
| download | eurephia-c9637d0500489e0d22e51faef2fd0df6c74391c9.tar.gz eurephia-c9637d0500489e0d22e51faef2fd0df6c74391c9.tar.xz eurephia-c9637d0500489e0d22e51faef2fd0df6c74391c9.zip | |
Fixed some missing info after change to XML
Added again the "Associated certificates" info (int value) and will
now also show a default value ("not set"/"-") if firewall access
profile is not set.
Diffstat (limited to 'eurephiadm')
| -rw-r--r-- | eurephiadm/commands/users.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/eurephiadm/commands/users.c b/eurephiadm/commands/users.c index ad19a50..f39a1e0 100644 --- a/eurephiadm/commands/users.c +++ b/eurephiadm/commands/users.c @@ -207,7 +207,8 @@ char *xmlFlags2str(xmlXPathContext *xpathCTX, const char *xpath) { for( i = 0; i < flagsObj->nodesetval->nodeNr; i++ ) { char *flag = xmlExtractContent(flagsObj->nodesetval->nodeTab[i]); if( flag != NULL ) { - strncat(flagstr, flag, 8192-strlen_nullsafe(flagstr)); + strncat(flagstr, flag, 8191-strlen_nullsafe(flagstr)); + strcat(flagstr, " "); } } xmlXPathFreeObject(flagsObj); @@ -226,6 +227,14 @@ void xmlPrint_certs(xmlXPathContext *certsXP, const char *xpath) { } + if( certsObj->nodesetval->nodeNr == 0 ) { + field_print_str("Associated certificates", "None"); + printf("\n"); + xmlXPathFreeObject(certsObj); + return; + } + field_print_int("Associated certificates", certsObj->nodesetval->nodeNr); + printf("\n"); printf(" %3s (D) %-35.35s %33.33s\n %-49.49s %19.19s\n", "ID", "Common name", "Organisation", "e-mail", "Registered"); #ifdef FIREWALL @@ -258,8 +267,8 @@ void xmlPrint_certs(xmlXPathContext *certsXP, const char *xpath) { xmlGetAttrValue(certnode->properties, "registered")); #ifdef FIREWALL printf(" %-44.44s %24.24s\n", - xmlExtractContent(acpr), - xmlGetAttrValue(acpr->properties, "fwdestination")); + defaultValue(xmlExtractContent(acpr), "(not set)"), + defaultValue(xmlGetAttrValue(acpr->properties, "fwdestination"), "-")); #endif if( (i+1) < certsObj->nodesetval->nodeNr ) { printf("\n"); |