default argument allowed for signature and sendas

This commit is contained in:
Ross Scroggs
2016-08-30 16:45:58 -07:00
parent 4182b3cd1e
commit b8b268f0ad

View File

@ -4991,6 +4991,9 @@ def getSendAsAttributes(i, myarg, body, tagReplacements, command):
elif myarg == u'replyto': elif myarg == u'replyto':
body[u'replyToAddress'] = sys.argv[i+1] body[u'replyToAddress'] = sys.argv[i+1]
i += 2 i += 2
elif myarg == u'default':
body[u'isDefault'] = True
i += 1
elif myarg == u'treatasalias': elif myarg == u'treatasalias':
if sys.argv[i+1].lower() == u'true': if sys.argv[i+1].lower() == u'true':
body[u'treatAsAlias'] = True body[u'treatAsAlias'] = True
@ -5028,9 +5031,6 @@ def addUpdateSendAs(users, i, addCmd):
filename = sys.argv[i] filename = sys.argv[i]
i, encoding = getCharSet(i+1) i, encoding = getCharSet(i+1)
signature = readFile(filename, encoding=encoding) signature = readFile(filename, encoding=encoding)
elif myarg == u'default':
body[u'isDefault'] = True
i += 1
else: else:
i = getSendAsAttributes(i, myarg, body, tagReplacements, command) i = getSendAsAttributes(i, myarg, body, tagReplacements, command)
if signature != None: if signature != None: