--- sourceforge.net/trunk/rdesktop/rdesktop.c 2002/10/11 05:13:19 223 +++ sourceforge.net/trunk/rdesktop/rdesktop.c 2003/01/28 12:27:28 297 @@ -21,8 +21,8 @@ #include /* va_list va_start va_end */ #include /* read close getuid getgid getpid getppid gethostname */ #include /* open */ +#include /* save licence uses it. */ #include /* getpwuid */ -#include /* PATH_MAX */ #include /* tcgetattr tcsetattr */ #include /* stat */ #include /* gettimeofday */ @@ -45,7 +45,8 @@ char hostname[16]; char keymapname[16]; int keylayout = 0x409; /* Defaults to US keyboard layout */ -int width = 800; +int width = 800; /* If width or height are reset to zero, the geometry will + be fetched from _NET_WORKAREA */ int height = 600; int tcp_port_rdp = TCP_PORT_RDP; BOOL bitmap_compression = True; @@ -55,6 +56,8 @@ BOOL desktop_save = True; BOOL fullscreen = False; BOOL grab_keyboard = True; +BOOL hide_decorations = False; +extern BOOL owncolmap; /* Display usage information */ static void @@ -77,8 +80,10 @@ fprintf(stderr, " -b: force bitmap updates\n"); fprintf(stderr, " -e: disable encryption (French TS)\n"); fprintf(stderr, " -m: do not send motion events\n"); + fprintf(stderr, " -C: use private colour map\n"); fprintf(stderr, " -K: keep window manager key bindings\n"); fprintf(stderr, " -T: window title\n"); + fprintf(stderr, " -D: hide window manager decorations\n"); } static BOOL @@ -125,25 +130,27 @@ char fullhostname[64]; char domain[16]; char password[16]; - char shell[32]; + char shell[128]; char directory[32]; BOOL prompt_password; struct passwd *pw; uint32 flags; char *p; int c; + int username_option = 0; flags = RDP_LOGON_NORMAL; prompt_password = False; domain[0] = password[0] = shell[0] = directory[0] = 0; - strcpy(keymapname, "us"); + strcpy(keymapname, "en-us"); - while ((c = getopt(argc, argv, "u:d:s:c:p:n:k:g:fbemKT:h?")) != -1) + while ((c = getopt(argc, argv, "u:d:s:c:p:n:k:g:fbemCKT:Dh?")) != -1) { switch (c) { case 'u': STRNCPY(username, optarg, sizeof(username)); + username_option = 1; break; case 'd': @@ -183,6 +190,12 @@ break; case 'g': + if (!strcmp(optarg, "workarea")) + { + width = height = 0; + break; + } + width = strtol(optarg, &p, 10); if (*p == 'x') height = strtol(p + 1, NULL, 10); @@ -210,6 +223,10 @@ sendmotion = False; break; + case 'C': + owncolmap = True; + break; + case 'K': grab_keyboard = False; break; @@ -218,6 +235,10 @@ STRNCPY(title, optarg, sizeof(title)); break; + case 'D': + hide_decorations = True; + break; + case 'h': case '?': default: @@ -240,7 +261,7 @@ *p = 0; } - if (username[0] == 0) + if (!username_option) { pw = getpwuid(getuid()); if ((pw == NULL) || (pw->pw_name == NULL)) @@ -312,16 +333,16 @@ addr.sun_family = AF_UNIX; memcpy(addr.sun_path, EGD_SOCKET, sizeof(EGD_SOCKET)); - if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) == -1) + if (connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1) goto err; /* PRNGD and EGD use a simple communications protocol */ - buf[0] = 1; /* Non-blocking (similar to /dev/urandom) */ - buf[1] = 32; /* Number of requested random bytes */ + buf[0] = 1; /* Non-blocking (similar to /dev/urandom) */ + buf[1] = 32; /* Number of requested random bytes */ if (write(fd, buf, 2) != 2) goto err; - if ((read(fd, buf, 1) != 1) || (buf[0] == 0)) /* Available? */ + if ((read(fd, buf, 1) != 1) || (buf[0] == 0)) /* Available? */ goto err; if (read(fd, buf, 32) != 32) @@ -329,7 +350,7 @@ ret = True; -err: + err: close(fd); return ret; } @@ -362,7 +383,7 @@ #endif /* Otherwise use whatever entropy we can gather - ideas welcome. */ - r = (uint32 *)random; + r = (uint32 *) random; r[0] = (getpid()) | (getppid() << 16); r[1] = (getuid()) | (getgid() << 16); r[2] = times(&tmsbuf); /* system uptime (clocks) */ @@ -374,10 +395,10 @@ /* Hash both halves with MD5 to obscure possible patterns */ MD5_Init(&md5); - MD5_Update(&md5, random, 16); + MD5_Update(&md5, random, 16); MD5_Final(random, &md5); - MD5_Update(&md5, random+16, 16); - MD5_Final(random+16, &md5); + MD5_Update(&md5, random + 16, 16); + MD5_Final(random + 16, &md5); } /* malloc; exit if out of memory */ @@ -426,6 +447,19 @@ va_end(ap); } +/* report a warning */ +void +warning(char *format, ...) +{ + va_list ap; + + fprintf(stderr, "WARNING: "); + + va_start(ap, format); + vfprintf(stderr, format, ap); + va_end(ap); +} + /* report an unimplemented protocol feature */ void unimpl(char *format, ...) @@ -473,7 +507,7 @@ int load_licence(unsigned char **data) { - char path[PATH_MAX]; + char *path; char *home; struct stat st; int fd; @@ -482,8 +516,8 @@ if (home == NULL) return -1; - STRNCPY(path, home, sizeof(path)); - strncat(path, "/.rdesktop/licence", sizeof(path) - strlen(path) - 1); + path = xmalloc(strlen(home) + strlen(hostname) + 20); + sprintf(path, "%s/.rdesktop/licence.%s", home, hostname); fd = open(path, O_RDONLY); if (fd == -1) @@ -499,28 +533,130 @@ void save_licence(unsigned char *data, int length) { - char path[PATH_MAX]; + char *fpath; /* file path for licence */ + char *fname, *fnamewrk; /* file name for licence .inkl path. */ char *home; - int fd; + uint32 y; + struct flock fnfl; + int fnfd, fnwrkfd, i, wlen; + struct stream s, *s_ptr; + uint32 len; + + /* Construct a stream, so that we can use macros to extract the + * licence. + */ + s_ptr = &s; + s_ptr->p = data; + /* Skip first two bytes */ + in_uint16(s_ptr, len); + + /* Skip three strings */ + for (i = 0; i < 3; i++) + { + in_uint32(s_ptr, len); + s_ptr->p += len; + /* Make sure that we won't be past the end of data after + * reading the next length value + */ + if ((s_ptr->p) + 4 > data + length) + { + printf("Error in parsing licence key.\n"); + printf("Strings %d end value %x > supplied length (%x)\n", + i, s_ptr->p, data + length); + return; + } + } + in_uint32(s_ptr, len); + if (s_ptr->p + len > data + length) + { + printf("Error in parsing licence key.\n"); + printf("End of licence %x > supplied length (%x)\n", s_ptr->p + len, data + length); + return; + } home = getenv("HOME"); if (home == NULL) return; - STRNCPY(path, home, sizeof(path)); - strncat(path, "/.rdesktop", sizeof(path) - strlen(path) - 1); - mkdir(path, 0700); + /* set and create the directory -- if it doesn't exist. */ + fpath = xmalloc(strlen(home) + 11); + STRNCPY(fpath, home, strlen(home) + 1); - strncat(path, "/licence", sizeof(path) - strlen(path) - 1); + sprintf(fpath, "%s/.rdesktop", fpath); + if (mkdir(fpath, 0700) == -1 && errno != EEXIST) + { + perror("mkdir"); + exit(1); + } - fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0600); - if (fd == -1) + /* set the real licence filename, and put a write lock on it. */ + fname = xmalloc(strlen(fpath) + strlen(hostname) + 10); + sprintf(fname, "%s/licence.%s", fpath, hostname); + fnfd = open(fname, O_RDONLY); + if (fnfd != -1) + { + fnfl.l_type = F_WRLCK; + fnfl.l_whence = SEEK_SET; + fnfl.l_start = 0; + fnfl.l_len = 1; + fcntl(fnfd, F_SETLK, &fnfl); + } + + /* create a temporary licence file */ + fnamewrk = xmalloc(strlen(fname) + 12); + for (y = 0;; y++) + { + sprintf(fnamewrk, "%s.%lu", fname, y); + fnwrkfd = open(fnamewrk, O_WRONLY | O_CREAT | O_EXCL, 0600); + if (fnwrkfd == -1) + { + if (errno == EINTR || errno == EEXIST) + continue; + perror("create"); + exit(1); + } + break; + } + /* write to the licence file */ + for (y = 0; y < len;) { - perror("open"); - return; + do + { + wlen = write(fnwrkfd, s_ptr->p + y, len - y); + } + while (wlen == -1 && errno == EINTR); + if (wlen < 1) + { + perror("write"); + unlink(fnamewrk); + exit(1); + } + y += wlen; + } + + /* close the file and rename it to fname */ + if (close(fnwrkfd) == -1) + { + perror("close"); + unlink(fnamewrk); + exit(1); + } + if (rename(fnamewrk, fname) == -1) + { + perror("rename"); + unlink(fnamewrk); + exit(1); + } + /* close the file lock on fname */ + if (fnfd != -1) + { + fnfl.l_type = F_UNLCK; + fnfl.l_whence = SEEK_SET; + fnfl.l_start = 0; + fnfl.l_len = 1; + fcntl(fnfd, F_SETLK, &fnfl); + close(fnfd); } - write(fd, data, length); - close(fd); } #endif