diff options
| author | Michael Albinus | 2012-12-29 00:09:13 -0800 |
|---|---|---|
| committer | Glenn Morris | 2012-12-29 00:09:13 -0800 |
| commit | 3ee24a3b32543fa4cf4a2102082491cf6bcb45c5 (patch) | |
| tree | f91b72859c840d9c2e88c4599c080d16b8c3957a | |
| parent | 33cb20438f5d6d4898cdbb9fdebe308260b06262 (diff) | |
| download | emacs-3ee24a3b32543fa4cf4a2102082491cf6bcb45c5.tar.gz emacs-3ee24a3b32543fa4cf4a2102082491cf6bcb45c5.zip | |
* net/tramp-sh.el (tramp-set-file-uid-gid): Convert UID and GID to
integers, if they are real numbers. (Bug#13282)
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f7664b663ac..6aabc603518 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-12-28 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp-sh.el (tramp-set-file-uid-gid): Convert UID and GID to | ||
| 4 | integers, if they are real numbers. (Bug#13282) | ||
| 5 | |||
| 1 | 2012-12-26 Dmitry Gutov <dgutov@yandex.ru> | 6 | 2012-12-26 Dmitry Gutov <dgutov@yandex.ru> |
| 2 | 7 | ||
| 3 | * progmodes/ruby-mode.el (ruby-indent-beg-re): Only allow "class", | 8 | * progmodes/ruby-mode.el (ruby-indent-beg-re): Only allow "class", |
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 340b7ad353d..e903708275e 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el | |||
| @@ -1455,7 +1455,9 @@ and gid of the corresponding user is taken. Both parameters must be integers." | |||
| 1455 | ;; working with su(do)? when it is needed, so it shall succeed in | 1455 | ;; working with su(do)? when it is needed, so it shall succeed in |
| 1456 | ;; the majority of cases. | 1456 | ;; the majority of cases. |
| 1457 | ;; Don't modify `last-coding-system-used' by accident. | 1457 | ;; Don't modify `last-coding-system-used' by accident. |
| 1458 | (let ((last-coding-system-used last-coding-system-used)) | 1458 | (let ((last-coding-system-used last-coding-system-used) |
| 1459 | (uid (and (numberp uid) (round uid))) | ||
| 1460 | (gid (and (numberp gid) (round gid)))) | ||
| 1459 | (if (file-remote-p filename) | 1461 | (if (file-remote-p filename) |
| 1460 | (with-parsed-tramp-file-name filename nil | 1462 | (with-parsed-tramp-file-name filename nil |
| 1461 | (if (and (zerop (user-uid)) (tramp-local-host-p v)) | 1463 | (if (and (zerop (user-uid)) (tramp-local-host-p v)) |