Added aliases for unit and organization.

diff --git a/src/certtool-cfg.c b/src/certtool-cfg.c
index 1a18215b1e4749287fa72e404d91eb804038d8c8..c1066a5c08ffadc81796796d245d0f5d837f4388 100644 (file)
--- a/src/certtool-cfg.c
+++ b/src/certtool-cfg.c
@@ -208,7 +208,14 @@ int template_parse(const char *template)
 
        /* Option variables */
        READ_MULTI_LINE("unit", cfg.unit);
-       READ_MULTI_LINE("unit", cfg.organization);
+       if (cfg.unit == NULL) {
+               READ_MULTI_LINE("ou", cfg.unit);
+       }
+
+       READ_MULTI_LINE("organization", cfg.organization);
+       if (cfg.organization == NULL) {
+               READ_MULTI_LINE("o", cfg.organization);
+       }
 
        val = optionGetValue(pov, "locality");
        if (val != NULL && val->valType == OPARG_TYPE_STRING)