@@ -436,7 +436,9 @@ impl Service {
436436 // Discover existing keyrings
437437 let discovered_keyrings = service. discover_keyrings ( secret) . await ?;
438438
439- service. initialize ( connection, discovered_keyrings) . await ?;
439+ service
440+ . initialize ( connection, discovered_keyrings, true )
441+ . await ?;
440442
441443 // Start PAM listener
442444 tracing:: info!( "Starting PAM listener" ) ;
@@ -476,7 +478,9 @@ impl Service {
476478 vec ! [ ]
477479 } ;
478480
479- service. initialize ( connection, default_keyring) . await ?;
481+ service
482+ . initialize ( connection, default_keyring, false )
483+ . await ?;
480484 Ok ( service)
481485 }
482486
@@ -684,6 +688,7 @@ impl Service {
684688 & self ,
685689 connection : zbus:: Connection ,
686690 mut discovered_keyrings : Vec < ( String , String , Keyring ) > , // (name, alias, keyring)
691+ auto_create_default : bool ,
687692 ) -> Result < ( ) , Error > {
688693 self . connection . set ( connection. clone ( ) ) . unwrap ( ) ;
689694
@@ -695,7 +700,7 @@ impl Service {
695700 . iter ( )
696701 . any ( |( _, alias, _) | alias == oo7:: dbus:: Service :: DEFAULT_COLLECTION ) ;
697702
698- if !has_default {
703+ if !has_default && auto_create_default {
699704 tracing:: info!( "No default collection found, creating 'Login' keyring" ) ;
700705
701706 let locked_keyring = LockedKeyring :: open ( "login" ) . await . inspect_err ( |e| {
0 commit comments