Author: mcalmer Date: Wed Jun 20 17:17:08 2007 New Revision: 38931 URL: http://svn.opensuse.org/viewcvs/yast?rev=38931&view=rev Log: parse output of get and list commands and document the output Modified: trunk/kerberos-server/agents/ag_kadmin trunk/kerberos-server/agents/kadmin_test.pl Modified: trunk/kerberos-server/agents/ag_kadmin URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-server/agents/ag_kadmin?rev=38931&r1=38930&r2=38931&view=diff ============================================================================== --- trunk/kerberos-server/agents/ag_kadmin (original) +++ trunk/kerberos-server/agents/ag_kadmin Wed Jun 20 17:17:08 2007 @@ -333,6 +333,40 @@ } my $ret = call_kadmin($class, "get_principal", $cmd_args, $cmd_input, 2); + + if($args->{cmd_args}->[0] eq "-terse") + { + my $princ = {}; + + my @p = split('\t', $ret); + + $princ->{princ} = $p[0]; + $princ->{princ_expire_time} = $p[1]; + $princ->{last_pwd_change} = $p[2]; + $princ->{pw_expiration} = $p[3]; + $princ->{max_life} = $p[4]; + $princ->{mod_princ} = $p[5]; + $princ->{mod_date} = $p[6]; + $princ->{attributes} = $p[7]; + $princ->{kvno} = $p[8]; + $princ->{mkvno} = $p[9]; + $princ->{policy} = $p[10]; + $princ->{max_renewable_life} = $p[11]; + $princ->{last_success} = $p[12]; + $princ->{last_failed} = $p[13]; + $princ->{fail_auth_count} = $p[14]; + $princ->{n_key_data} = $p[15]; + for(my $i = 0; $i < $p[15]; $i++) + { + $princ->{"key_data_ver_$i"} = $p[15+($i*4)+1]; + $princ->{"key_data_kvno_$i"} = $p[15+($i*4)+2]; + $princ->{"key_data_enctype_$i"} = $p[15+($i*4)+3]; + $princ->{"key_data_salt_$i"} = $p[15+($i*4)+4]; + } + + return $princ; + + } return $ret; } @@ -358,8 +392,8 @@ } my $ret = call_kadmin($class, "list_principals", $cmd_args, $cmd_input, 2); - - return $ret; + my @list = split('\n', $ret); + return \@list; } sub add_policy @@ -458,6 +492,23 @@ } my $ret = call_kadmin($class, "get_policy", $cmd_args, $cmd_input, 2); + + if($args->{cmd_args}->[0] eq "-terse") + { + my $pol = {}; + + my @p = split('\t', $ret); + + $pol->{policy} = $p[0]; + $pol->{pw_max_life} = $p[1]; + $pol->{pw_min_life} = $p[2]; + $pol->{pw_min_length} = $p[3]; + $pol->{pw_min_classes} = $p[4]; + $pol->{pw_history_num} = $p[5]; + $pol->{policy_refcnt} = $p[6]; + + return $pol; + } return $ret; } @@ -483,8 +534,8 @@ } my $ret = call_kadmin($class, "list_policies", $cmd_args, $cmd_input, 2); - - return $ret; + my @list = split('\n', $ret); + return \@list; } sub ktadd @@ -740,6 +791,67 @@ B - array of strings to print to STDIN, e.g. passwords +When the -terse option is given, this function returns a hash with the following keys: + +B<princ> + +B + +B + +B + +B + +B + +B + +B<attributes> + +B<kvno> + +B<mkvno> + +B<policy> + +B + +B + +B + +B + +B + +For every key additional data exists. These key_data fields are enumerated. + +B + +B + +B + +B + +Example: + +The first key has the fields: + + key_data_ver_0 + key_data_kvno_0 + key_data_enctype_0 + key_data_slat_0 + +The second key has the fields: + + key_data_ver_1 + key_data_kvno_1 + key_data_enctype_1 + key_data_slat_1 + + =item * B<.list_principals($args)> @@ -749,6 +861,8 @@ B - array of strings to print to STDIN, e.g. passwords +This function returns an array of strings. + =item * B<.add_policy($args)> @@ -785,6 +899,23 @@ B - array of strings to print to STDIN, e.g. passwords +When the -terse option is given, this function returns a hash with the following keys: + +B<policy> + +B + +B + +B + +B + +B + +B + + =item * B<.list_policies($args)> @@ -794,6 +925,8 @@ B - array of strings to print to STDIN, e.g. passwords +This function returns an array of strings. + =item * B<.ktadd($args)> Modified: trunk/kerberos-server/agents/kadmin_test.pl URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-server/agents/kadmin_test.pl?rev=38931&r1=38930&r2=38931&view=diff ============================================================================== --- trunk/kerberos-server/agents/kadmin_test.pl (original) +++ trunk/kerberos-server/agents/kadmin_test.pl Wed Jun 20 17:17:08 2007 @@ -37,7 +37,7 @@ print "ERROR: ".Data::Dumper->Dump([SCR->Error(".kadmin")])."\n"; exit 1; } -print "Return value:".Data::Dumper->Dump([$ret]); +print "add_principal:".Data::Dumper->Dump([$ret]); ################################################################### @@ -50,7 +50,7 @@ print "ERROR: ".Data::Dumper->Dump([SCR->Error(".kadmin")])."\n"; exit 1; } -print "Return value:".Data::Dumper->Dump([$ret]); +print "modify_principal:".Data::Dumper->Dump([$ret]); ################################################################### @@ -63,7 +63,20 @@ print "ERROR: ".Data::Dumper->Dump([SCR->Error(".kadmin")])."\n"; exit 1; } -print "Return value:".Data::Dumper->Dump([$ret]); +print "get_principal:".Data::Dumper->Dump([$ret]); + +################################################################### + +$args = { + "cmd_args" => ["-terse", "ugansert"], + }; +$ret = SCR->Execute(".kadmin.get_principal", $args); +if(!defined $ret) +{ + print "ERROR: ".Data::Dumper->Dump([SCR->Error(".kadmin")])."\n"; + exit 1; +} +print "get_principal:".Data::Dumper->Dump([$ret]); ################################################################### @@ -77,7 +90,7 @@ print "ERROR: ".Data::Dumper->Dump([SCR->Error(".kadmin")])."\n"; exit 1; } -print "Return value:".Data::Dumper->Dump([$ret]); +print "change_password:".Data::Dumper->Dump([$ret]); ################################################################### @@ -91,7 +104,7 @@ print "ERROR: ".Data::Dumper->Dump([SCR->Error(".kadmin")])."\n"; exit 1; } -print "Return value:".Data::Dumper->Dump([$ret]); +print "delete_principal:".Data::Dumper->Dump([$ret]); ################################################################### @@ -103,11 +116,12 @@ print "ERROR: ".Data::Dumper->Dump([SCR->Error(".kadmin")])."\n"; exit 1; } +print "list_principals:".Data::Dumper->Dump([$ret]); ################################################################### $args = { - "cmd_args" => ["-maxlife", "3 month", "defaultpol"], + "cmd_args" => ["-maxlife", "3 month", "mydefaultpol"], }; $ret = SCR->Execute(".kadmin.add_policy", $args); if(!defined $ret) @@ -115,13 +129,13 @@ print "ERROR: ".Data::Dumper->Dump([SCR->Error(".kadmin")])."\n"; exit 1; } -print "Return value:".Data::Dumper->Dump([$ret]); +print "add_policy:".Data::Dumper->Dump([$ret]); ################################################################### $args = { - "cmd_args" => ["-minlength", "6", "defaultpol"], + "cmd_args" => ["-minlength", "6", "mydefaultpol"], }; $ret = SCR->Execute(".kadmin.modify_policy", $args); if(!defined $ret) @@ -129,7 +143,7 @@ print "ERROR: ".Data::Dumper->Dump([SCR->Error(".kadmin")])."\n"; exit 1; } -print "Return value:".Data::Dumper->Dump([$ret]); +print "modify_policy:".Data::Dumper->Dump([$ret]); ################################################################### @@ -140,12 +154,12 @@ print "ERROR: ".Data::Dumper->Dump([SCR->Error(".kadmin")])."\n"; exit 1; } -print "Return value:".Data::Dumper->Dump([$ret]); +print "list_policies:".Data::Dumper->Dump([$ret]); ################################################################### $args = { - "cmd_args" => ["defaultpol"], + "cmd_args" => ["mydefaultpol"], }; $ret = SCR->Execute(".kadmin.get_policy", $args); if(!defined $ret) @@ -153,13 +167,25 @@ print "ERROR: ".Data::Dumper->Dump([SCR->Error(".kadmin")])."\n"; exit 1; } -print "Return value:".Data::Dumper->Dump([$ret]); +print "get_policy:".Data::Dumper->Dump([$ret]); + +################################################################### +$args = { + "cmd_args" => ["-terse", "mydefaultpol"], + }; +$ret = SCR->Execute(".kadmin.get_policy", $args); +if(!defined $ret) +{ + print "ERROR: ".Data::Dumper->Dump([SCR->Error(".kadmin")])."\n"; + exit 1; +} +print "get_policy:".Data::Dumper->Dump([$ret]); ################################################################### $args = { - "cmd_args" => ["-force", "defaultpol"], + "cmd_args" => ["-force", "mydefaultpol"], }; $ret = SCR->Execute(".kadmin.delete_policy", $args); if(!defined $ret) @@ -167,7 +193,7 @@ print "ERROR: ".Data::Dumper->Dump([SCR->Error(".kadmin")])."\n"; exit 1; } -print "Return value:".Data::Dumper->Dump([$ret]); +print "delete_policy:".Data::Dumper->Dump([$ret]); ################################################################### @@ -180,7 +206,7 @@ print "ERROR: ".Data::Dumper->Dump([SCR->Error(".kadmin")])."\n"; exit 1; } -print "Return value:".Data::Dumper->Dump([$ret]); +print "ktadd:".Data::Dumper->Dump([$ret]); ################################################################### @@ -193,12 +219,5 @@ print "ERROR: ".Data::Dumper->Dump([SCR->Error(".kadmin")])."\n"; exit 1; } -print "Return value:".Data::Dumper->Dump([$ret]); - - - -#print Data::Dumper->Dump([$ret])."\n"; -#print "$ret\n"; - - +print "ktremove:".Data::Dumper->Dump([$ret]); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org