/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2008-08-07 21:45:41 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080807214541-pyg8itw6kphz1dy5
* plugbasedclient.c: Renamed to "mandos-client.c".  All users changed.

* plugins.d/mandosclient.c: Renamed to "plugins.d/password-request.c".
                            All users changed.

* plugins.d/passprompt.c: Renamed to "plugins.d/password-prompt.c".
                          All users changed.

* server.conf: Renamed to "mandos.conf".  All users changed.

* server.py: Renamed to "mandos".
  (daemon): Have default values for arguments. Caller changed.

* Makefile (distclean, mostlyclean, maintainer-clean): New aliases for
                                                       "clean".
  (check, run-client, run-server): New.

* network-protocol.txt: New.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
616
616
    return if_nametoindex(interface)
617
617
 
618
618
 
619
 
def daemon(nochdir, noclose):
 
619
def daemon(nochdir = False, noclose = False):
620
620
    """See daemon(3).  Standard BSD Unix function.
621
621
    This should really exist as os.daemon, but it doesn't (yet)."""
622
622
    if os.fork():
683
683
    # Parse config file for server-global settings
684
684
    server_config = ConfigParser.SafeConfigParser(server_defaults)
685
685
    del server_defaults
686
 
    server_config.read(os.path.join(options.configdir, "server.conf"))
 
686
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
687
687
    server_section = "server"
688
688
    # Convert the SafeConfigParser object to a dict
689
689
    server_settings = dict(server_config.items(server_section))
753
753
                       for section in client_config.sections()))
754
754
    
755
755
    if not debug:
756
 
        daemon(False, False)
 
756
        daemon()
757
757
    
758
758
    def cleanup():
759
759
        "Cleanup function; run on exit"