/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-ctl

  • Committer: Björn Påhlsson
  • Date: 2009-01-19 06:55:59 UTC
  • mto: (237.7.1 mandos) (24.1.154 mandos)
  • mto: This revision was merged to the branch mainline in revision 250.
  • Revision ID: belorn@braxen-20090119065559-vvflkj7ffxtn4ez4
fixed a bugg in mandos-ctl + added remove client option

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
115
115
parser.add_option("-a", "--all", action="store_true",
116
116
                  help="Print all fields")
117
117
parser.add_option("-e", "--enable", action="store_true",
118
 
                  help="Enable specified client")
 
118
                  help="Enable client")
119
119
parser.add_option("-d", "--disable", action="store_true",
120
 
                  help="disable specified client")
 
120
                  help="disable client")
121
121
parser.add_option("-b", "--bump-timeout", action="store_true",
122
 
                  help="Bump timeout of specified client")
 
122
                  help="Bump timeout for client")
123
123
parser.add_option("--start-checker", action="store_true",
124
 
                  help="Start checker for specified client")
 
124
                  help="Start checker for client")
125
125
parser.add_option("--stop-checker", action="store_true",
126
 
                  help="Stop checker for specified client")
 
126
                  help="Stop checker for client")
127
127
parser.add_option("-V", "--is-valid", action="store_true",
128
 
                  help="Check if specified client is still valid")
129
 
parser.add_option("-Q", "--quit", action="store_true",
130
 
                  help="Stops the running mandos server")
 
128
                  help="Check if client is still valid")
 
129
parser.add_option("-r", "--remove", action="store_true",
 
130
                  help="Remove client")
131
131
parser.add_option("-c", "--checker", type="string",
132
 
                  help="Set checker command for specified client")
 
132
                  help="Set checker command for client")
133
133
parser.add_option("-t", "--timeout", type="string",
134
 
                  help="Set timeout for specified client")
 
134
                  help="Set timeout for client")
135
135
parser.add_option("-i", "--interval", type="string",
136
 
                  help="Set checker interval for specified client")
 
136
                  help="Set checker interval for client")
137
137
parser.add_option("-H", "--host", type="string",
138
 
                  help="Set host for specified client")
 
138
                  help="Set host for client")
139
139
parser.add_option("-s", "--secret", type="string",
140
 
                  help="Set password blob (file) for specified client")
 
140
                  help="Set password blob (file) for client")
141
141
options, client_names = parser.parse_args()
142
142
 
 
143
# Compile list of clients to processed
143
144
clients=[]
144
145
for name in client_names:
145
146
    for path, client in mandos_clients.iteritems():
153
154
        print >> sys.stderr, "Client not found on server: %r" % name
154
155
        sys.exit(1)
155
156
 
156
 
if not clients:
 
157
if not clients and mandos_clients.values():
157
158
    keywords = defaultkeywords
158
159
    if options.all:
159
160
        keywords = ('name', 'enabled', 'timeout', 'last_checked_ok',
160
161
                    'created', 'interval', 'host', 'fingerprint',
161
162
                    'checker_running', 'last_enabled', 'checker')
162
163
    print_clients(mandos_clients.values())
163
 
    
 
164
 
 
165
# Process each client in the list by all selected options
164
166
for client in clients:
 
167
    if options.remove:
 
168
        mandos_serv.RemoveClient(client.__dbus_object_path__)
165
169
    if options.enable:
166
170
        client.Enable()
167
171
    if options.disable: