OpenPAM/OpenPAM
OpenPAM/OpenPAM
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add the new error codes and rewrite the error code handling to support

Browse source 
negated entries, e.g. in cases a() calls b() and b() can return code X
in certain situations, but a() ensures that this never happens.


git-svn-id: svn+ssh://svn.openpam.org/svn/openpam/trunk@929 185d5e19-27fe-0310-9dcf-9bff6b9f3609
This commit is contained in:
Dag-Erling Smørgrav 2017-04-26 19:21:54 +00:00
parent 07daaf4bb2
commit c87aee7c52
1 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
misc/gendoc.pl
View file

@ -93,6 +93,8 @@ The OpenPAM library is maintained by
PAM_TRY_AGAIN => "Try again",
PAM_MODULE_UNKNOWN => "Unknown module type",
PAM_DOMAIN_UNKNOWN => "Unknown authentication domain",
PAM_BAD_HANDLE => "Invalid PAM handle",
PAM_BAD_ITEM => "Unrecognized or restricted item",
);
sub parse_source($) {
@ -114,7 +116,7 @@ sub parse_source($) {
my $experimental;
my $version;
my %xref;
my @errors;
my %errors;
my $author;
if ($fn !~ m,\.c$,) {
@ -168,8 +170,8 @@ sub parse_source($) {
if ($type eq "int") {
foreach (split("\n", $source)) {
next unless (m/^ \*\s+(!?PAM_[A-Z_]+|=[a-z_]+)\s*$/);
push(@errors, $1);
next unless (m/^ \*\t(!?PAM_[A-Z_]+|=[a-z_]+)\s*(.*?)\s*$/);
$errors{$1} = $2;
}
++$xref{3}->{pam_strerror};
}
@ -335,7 +337,7 @@ sub parse_source($) {
'args' => $args,
'man' => $man,
'xref' => \%xref,
'errors' => \@errors,
'errors' => \%errors,
'author' => $author,
'customrv' => $customrv,
'deprecated' => $deprecated,
@ -365,13 +367,13 @@ sub expand_errors($) {
}
$$func{recursed} = 1;
foreach (@{$$func{errors}}) {
foreach (keys %{$$func{errors}}) {
if (m/^(PAM_[A-Z_]+)$/) {
if (!defined($PAMERR{$1})) {
warn("$$func{name}(): unrecognized error: $1\n");
next;
}
$errors{$1} = 1;
$errors{$1} = $$func{errors}->{$_};
} elsif (m/^!(PAM_[A-Z_]+)$/) {
# treat negations separately
} elsif (m/^=([a-z_]+)$/) {
@ -385,20 +387,20 @@ sub expand_errors($) {
warn("$$func{name}(): reference to unknown $ref()\n");
next;
}
foreach (@{$FUNCTIONS{$ref}->{errors}}) {
$errors{$_} = 1;
foreach (keys %{$FUNCTIONS{$ref}->{errors}}) {
$errors{$_} //= $FUNCTIONS{$ref}->{errors}->{$_};
}
} else {
warn("$$func{name}(): invalid error specification: $_\n");
}
}
foreach (@{$$func{errors}}) {
foreach (keys %{$$func{errors}}) {
if (m/^!(PAM_[A-Z_]+)$/) {
delete($errors{$1});
}
}
delete($$func{recursed});
$$func{errors} = [ sort(keys(%errors)) ];
$$func{errors} = \%errors;
}
sub dictionary_order($$) {
@ -430,6 +432,7 @@ sub gendoc($) {
my $func = shift; # Ref to function hash
local *FILE;
my %errors;
my $mdoc;
my $fn;
@ -489,18 +492,21 @@ sub gendoc($) {
$mdoc .= ".Ef\n.Pp\n";
}
$mdoc .= "$$func{man}\n";
my @errors = @{$$func{errors}};
%errors = %{$$func{errors}};
if ($$func{customrv}) {
# leave it
} elsif ($$func{type} eq "int" && @errors) {
} elsif ($$func{type} eq "int" && %errors) {
$mdoc .= ".Sh RETURN VALUES
The
.Fn $$func{name}
function returns one of the following values:
.Bl -tag -width 18n
";
foreach (@errors) {
$mdoc .= ".It Bq Er $_\n$PAMERR{$_}.\n";
delete($errors{PAM_SUCCESS});
foreach ('PAM_SUCCESS', sort keys %errors) {
$mdoc .= ".It Bq Er $_\n" .
($errors{$_} || $PAMERR{$_}) .
".\n";
}
$mdoc .= ".El\n";
} elsif ($$func{type} eq "int") {