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

change return code

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

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

@ -78,20 +78,26 @@ sub setStorePassword {
$key = $encode . $key; $key = $encode . $key;
} }
my $err = setKeyValue( $index, $enc_pwd ); my $err;
return qq{error while saving the password - $err} $err = setKeyValue( $index, $enc_pwd );
return(0)
if ( defined($err) ); if ( defined($err) );
return q{password successfully saved}; return(1);
} }
sub setDeletePassword { sub setDeletePassword {
my $self = shift; my $self = shift;
my $name = shift; my $name = shift;
setKeyValue( $defs{$name}->{TYPE} . '_' . $name . '_passwd', undef ); my $err;
$err = setKeyValue( $defs{$name}->{TYPE} . '_' . $name . '_passwd', undef );
return; return(0)
if ( defined($err) );
return(1);
} }
sub getReadPassword { sub getReadPassword {
@ -102,14 +108,14 @@ sub getReadPassword {
my $key = getUniqueId() . $index; my $key = getUniqueId() . $index;
my ( $password, $err ); my ( $password, $err );
Log3($name, 4, qq{GardenaSmartBridge ($name) - Read password from file}); Log3($name, 4, qq{password Keystore handle for Device ($name) - Read password from file});
( $err, $password ) = getKeyValue($index); ( $err, $password ) = getKeyValue($index);
if ( defined($err) ) { if ( defined($err) ) {
Log3($name, 3, Log3($name, 4,
qq{GardenaSmartBridge ($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;
} }
@ -134,7 +140,7 @@ qq{GardenaSmartBridge ($name) - unable to read password from file: $err});
} }
else { else {
Log3($name, 3, qq{GardenaSmartBridge ($name) - No password in file}); Log3($name, 4, qq{password Keystore handle for Device ($name) - No password in file});
return undef; return undef;
} }
} }
@ -146,10 +152,15 @@ sub setRename {
my $hash = $defs{$newname}; my $hash = $defs{$newname};
setStorePassword( $hash, $newname, getReadPassword( $hash, $oldname ) ); return(0)
setKeyValue( $hash->{TYPE} . '_' . $oldname . '_passwd', undef ); # remove old password value if ( !defined(getReadPassword( $hash, $oldname ))
or !defined(setStorePassword( $hash, $newname, getReadPassword( $hash, $oldname ) ) )
)
return(0)
if ( defined(setKeyValue( $hash->{TYPE} . '_' . $oldname . '_passwd', undef )) ); # remove old password value
return; return(1);
} }
1; 1;