# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1223122429 -7200
# Node ID 29c505d43b3ef8a7a83c284cbad9f03f1042706e
# Parent  890a703197cf9ce4df46b765d9c241e89cfcbfc7
Use random resource suffix by default
By default a random suffix is appended to the resource name,
as recommended in rfc3920bis ("For the sake of proper security, a resource
identifier SHOULD be random").

This behaviour can be altered with the new option "disable_random_resource".

diff -r 890a703197cf -r 29c505d43b3e mcabber/mcabberrc.example
--- a/mcabber/mcabberrc.example	Sat Oct 04 13:07:18 2008 +0200
+++ b/mcabber/mcabberrc.example	Sat Oct 04 14:13:49 2008 +0200
@@ -20,8 +20,13 @@
 #set password = yourpassword
 set server = your.jabber.server
 #set port = 5222
+#
 # If you don't know what a resource is, do not set it.
+# Set disable_random_resource to 1 if you don't want mcabber to add a random
+# suffix to the resource name.
 #set resource = mcabber
+#set disable_random_resource = 0
+#
 #set priority = 3
 #set priority_away = 0
 
@@ -292,7 +297,7 @@
 #set muc_disable_nick_hl = 0
 
 # Status messages
-# The "message" value will override all others, take care!
+# The 'message' value will override all others, take care!
 #set message = Unique message status
 #set message_avail     = I'm available
 #set message_free      = I'm free for chat
@@ -370,7 +375,7 @@
 #color mucnick my_friend yellow
 
 # Style
-# Note: the "log_win_height" and "roster_width" values below can be set
+# Note: the 'log_win_height' and 'roster_width' values below can be set
 # in real time when mcabber is running.  Refresh the screen (Ctrl-l) to
 # use the new values.
 #
@@ -379,7 +384,7 @@
 # Buddylist window width (minimum 2, default 24)
 #set roster_width=24
 #
-# The options "log_win_on_top" and "roster_win_on_right" can change the
+# The options 'log_win_on_top' and 'roster_win_on_right' can change the
 # position of the log window (top/bottom) and the position of the roster
 # (left/right).
 #set log_win_on_top = 0
@@ -406,7 +411,7 @@
 # When a contact sends "/me ", mcabber displays "*user ", where user
 # is the local part of the contact's jid.
 # If you want mcabber to display the complete bare jid (user@server.com),
-# set "buddy_me_fulljid" to 1 (default: 0)
+# set 'buddy_me_fulljid' to 1 (default: 0)
 #set buddy_me_fulljid = 1
 #
 # Display the status changes in the log window (default: 0, never)
@@ -417,14 +422,15 @@
 # Values:  0: never  1: only connect/disconnect  2: all
 #set show_status_in_buffer = 1
 #
-# Set "log_display_sender" to 1 to display the message sender's jid in the
+# Set 'log_display_sender' to 1 to display the message sender's jid in the
 # log window (default: 0, no)
 #set log_display_sender = 0
 #
-# Set "info" to anything you'd like to see in your lower status line
+# Set 'info' to anything you'd like to see in your lower status line.
 #set info = woot
-# Set url_regex to a regular expression matching urls. If it matches an url
-# in an incoming messages, it'll print it to the log window.
+#
+# Set 'url_regex' to a regular expression matching urls. If it matches an
+# url in an incoming messages, it'll print it to the log window.
 #set url_regex = "(((https?|ftps?|nntp)://)|www[.][-a-z0-9.]+|(mailto:|news:))(%[0-9A-F]{2}|[-_.!~*';/?:@&=+$,#[:alnum:]])+"
 
 # Contacts PGP information
diff -r 890a703197cf -r 29c505d43b3e mcabber/src/main.c
--- a/mcabber/src/main.c	Sat Oct 04 13:07:18 2008 +0200
+++ b/mcabber/src/main.c	Sat Oct 04 14:13:49 2008 +0200
@@ -70,6 +70,7 @@
 {
   const char *username, *password, *resource, *servername;
   const char *proxy_host;
+  const char *resource_prefix = PACKAGE_NAME;
   char *dynresource = NULL;
   char *fjid;
   int ssl;
@@ -138,16 +139,18 @@
   // We can't free the ca*_xp variables now, because they're not duplicated
   // in cw_set_ssl_options().
 
-  if (!resource) {
+  if (!resource)
+    resource = resource_prefix;
+
+  if (!settings_opt_get("disable_random_resource")) {
 #if HAVE_ARC4RANDOM
-    dynresource = g_strdup_printf("%s.%08x", PACKAGE_NAME, arc4random());
+    dynresource = g_strdup_printf("%s.%08x", resource, arc4random());
 #else
     unsigned int tab[2];
     srand(time(NULL));
     tab[0] = (unsigned int) (0xffff * (rand() / (RAND_MAX + 1.0)));
     tab[1] = (unsigned int) (0xffff * (rand() / (RAND_MAX + 1.0)));
-    dynresource = g_strdup_printf("%s.%04x%04x", PACKAGE_NAME,
-                                  tab[0], tab[1]);
+    dynresource = g_strdup_printf("%s.%04x%04x", resource, tab[0], tab[1]);
 #endif
     resource = dynresource;
   }