diff --git a/tsshbatch.py b/tsshbatch.py index 520db16..0558abd 100755 --- a/tsshbatch.py +++ b/tsshbatch.py @@ -20,7 +20,7 @@ CMDINCL = PROGENV + "CMDS" HOSTINCL = PROGENV + "HOSTS" -CVSID = "$Id: tsshbatch.py,v 1.176 2014/03/27 22:04:48 tundra Exp $" +CVSID = "$Id: tsshbatch.py,v 1.177 2014/03/27 22:12:33 tundra Exp $" VERSION = CVSID.split()[2] CPRT = "(c)" DATE = "2011-2014" @@ -70,7 +70,7 @@ HOSTNOISE = '[%s]' HOSTLIST = 'Hosts' INDENTWIDTH = 8 -OPTIONSLIST = 'G:H:NP:Sef:hkn:p:tvxy' +OPTIONSLIST = 'KG:H:NP:Sef:hkn:p:tvxy' PADWIDTH = 12 PATHDELIM = ':' PATHSEP = os.sep @@ -92,6 +92,7 @@ "Usage: tsshbatch.py [-NSehkvxy -G 'file dest' -P 'file dest' -f cmdfile -n name -p pw ] -H 'host ..' | hostlistfile [command arg ... ]\n" +\ " where,\n" +\ "\n" +\ + " -K Force password prompting - Overrides previous -k\n" +\ " -G 'file dest' GET file on host and write local dest directory\n" +\ " -H '...' List of targeted hosts passed as a single argument\n" +\ " -N Force prompting for username\n" +\ @@ -570,6 +571,9 @@ for opt, val in opts: + if opt == "-K": + KEYEXCHANGE = False + if opt == "-G": ProcessTXRQ(val, Get_Transfer_List)