FHEM/mod-Password
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

change code for setRename function

Browse Source
This commit is contained in:
Marko Oldenburg 2021-03-26 15:41:02 +01:00
parent 6adb73a10a
commit c2685a86bf
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/FHEM/Core/Password/Utils.pm
View File

@ -81,7 +81,7 @@ sub setStorePassword {
my $err; my $err;
$err = setKeyValue( $index, $enc_pwd ); $err = setKeyValue( $index, $enc_pwd );
return(0) return(undef,$err)
if ( defined($err) ); if ( defined($err) );
return(1); return(1);
@ -94,7 +94,7 @@ sub setDeletePassword {
my $err; my $err;
$err = setKeyValue( $defs{$name}->{TYPE} . '_' . $name . '_passwd', undef ); $err = setKeyValue( $defs{$name}->{TYPE} . '_' . $name . '_passwd', undef );
return(0) return(undef,$err)
if ( defined($err) ); if ( defined($err) );
return(1); return(1);
@ -117,7 +117,7 @@ sub getReadPassword {
Log3($name, 4, Log3($name, 4,
qq{password Keystore handle for Device ($name) - unable to read password from file: $err}); qq{password Keystore handle for Device ($name) - unable to read password from file: $err});
return undef; return (undef,$err);
} }
if ( defined($password) ) { if ( defined($password) ) {
@ -150,15 +150,19 @@ sub setRename {
my $newname = shift; my $newname = shift;
my $oldname = shift; my $oldname = shift;
my $hash = $defs{$newname}; my ($resp,$err);
return(0)
if ( !defined(getReadPassword( $hash, $oldname ))
or !defined(setStorePassword( $hash, $newname, getReadPassword( $hash, $oldname ) ) )
)
return(0) ($resp,$err) = $self->setStorePassword($newname,$self->getReadPassword($oldname)); # set new password value
if ( defined(setKeyValue( $hash->{TYPE} . '_' . $oldname . '_passwd', undef )) ); # remove old password value return(0,$err)
if ( !defined($resp)
and defined($err)
);
($resp,$err) = $self->setDeletePassword($oldname); # remove old password value
return(0,$err)
if ( !defined($resp)
and defined($err)
);
return(1); return(1);
} }