diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2010-04-02 17:37:27 +0100 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2010-04-02 17:40:33 +0100 |
| commit | a06ed99dffe7696f35fb1939893bf83ac0628a64 (patch) | |
| tree | 5e48beb62790b0fe71ed2694b6ec5b954d332d12 /src | |
| parent | 33aa0bdd942b7b4f2b6b8fd45c165a61fec3257a (diff) | |
conn: allow TargetHandle=0 when TargetHandleType=NONE
Thanks to Krzysztof Klinikowski for the initial patch.
Fixes fd.o#27378
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/conn.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/conn.py b/src/server/conn.py index bf2d8a3..ecd6b16 100644 --- a/src/server/conn.py +++ b/src/server/conn.py @@ -450,9 +450,9 @@ class ConnectionInterfaceRequests( target_id = props.get(CHANNEL_INTERFACE + '.TargetID', None) # Handle type 0 cannot have a handle. - if target_handle_type == HANDLE_TYPE_NONE and target_handle != None: + if target_handle_type == HANDLE_TYPE_NONE and target_handle not in (None, 0): raise InvalidArgument('When TargetHandleType is NONE, ' + - 'TargetHandle must be omitted') + 'TargetHandle must be omitted or 0') # Handle type 0 cannot have a TargetID. if target_handle_type == HANDLE_TYPE_NONE and target_id != None: |