Changeset 740 for vendor/current/source4/heimdal/kpasswd/kpasswd.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source4/heimdal/kpasswd/kpasswd.c (modified) (1 diff)

vendor/current/source4/heimdal/kpasswd/kpasswd.c ¶

@@ -118 +118 @@
     krb5_context context;
     krb5_principal principal;
-    int optind = 0;
     krb5_get_init_creds_opt *opt;
     krb5_ccache id = NULL;
     int exit_value;
-
-    optind = krb5_program_setup(&context, argc, argv,
-                                args, sizeof(args) / sizeof(args[0]), usage);
-
+    int optidx = 0;
+
+    setprogname(argv[0]);
+
+    if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optidx))
+        usage(1, args, sizeof(args) / sizeof(args[0]));
     if (help_flag)
-        usage (0, args, sizeof(args) / sizeof(args[0]));
-
-    if(version_flag){
-        print_version (NULL);
-        exit(0);
-    }
-
-    argc -= optind;
-    argv += optind;
+        usage(0, args, sizeof(args) / sizeof(args[0]));
+    if (version_flag) {
+        print_version(NULL);
+        return 0;
+    }
+    argc -= optidx;
+    argv += optidx;
 
     ret = krb5_init_context (&context);