rename cleanup_enctypes to cleanup_enctype

SorinS · Apr 12, 2015 · 0385d8f · 0385d8f
1 parent 1376954
commit 0385d8f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/msktkrb5.cpp b/msktkrb5.cpp
@@ -157,7 +157,7 @@ void cleanup_keytab(msktutil_flags *flags)
             //     compared directly. As a workaround we clean the
             //     current entry only if its time stamp and
             //     newest_timestamp differ by more than 2 seconds.
-            if ((cursor.enctype() == flags->cleanup_enctypes) ||
+            if ((cursor.enctype() == flags->cleanup_enctype) ||
                 ((ttNow - cursor.timestamp() >= flags->cleanup_days * 60 * 60 * 24) &&
                  (flags->cleanup_days != -1) &&
                  (abs(newest_timestamp - cursor.timestamp()) >= 2))) {

diff --git a/msktutil.cpp b/msktutil.cpp
@@ -886,7 +886,7 @@ int main(int argc, char *argv [])
 
         if (!strcmp(argv[i], "--remove-enctype")) {
             if (++i < argc) {
-                exec->flags->cleanup_enctypes = atoi(argv[i]);
+                exec->flags->cleanup_enctype = atoi(argv[i]);
             } else {
                 fprintf(stderr, "Error: No number given after '%s'\n", argv[i - 1]);
                 goto error;
@@ -938,7 +938,7 @@ int main(int argc, char *argv [])
 
     if (exec->mode == MODE_CLEANUP &&
         exec->flags->cleanup_days == -1 &&
-        exec->flags->cleanup_enctypes == VALUE_IGNORE) {
+        exec->flags->cleanup_enctype == VALUE_IGNORE) {
             fprintf(stderr, "Error: cleanup mode needs --remove-old or --remove-enctype\n");
             goto error;
     }
@@ -991,7 +991,7 @@ msktutil_flags::msktutil_flags() :
     auto_update_interval(30),
     kvno(0),
     cleanup_days(-1),
-    cleanup_enctypes(VALUE_IGNORE)
+    cleanup_enctype(VALUE_IGNORE)
 {}
 
 msktutil_flags::~msktutil_flags()

diff --git a/msktutil.h b/msktutil.h
@@ -206,7 +206,7 @@ struct msktutil_flags {
     int auto_update_interval;
     krb5_kvno kvno;
     int cleanup_days;
-    int cleanup_enctypes;
+    int cleanup_enctype;
     msktutil_flags();
     ~msktutil_flags();
 };