Resolved conflict w/ security additions

28 files changed, 1265 insertions, 31 deletions

diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..4362b49
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/client/client.c b/client/client.c
index fb93e1d..c5adcce 100644
--- a/client/client.c
+++ b/client/client.c
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #include <signal.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -30,6 +52,7 @@ typedef struct {
     resmsg_rset_t   rset;
     int             verbose;
     DBusBusType     bustype;
+    int             allow_unknown;
 } conf_t;
 
 typedef struct {
@@ -97,6 +120,8 @@ static resset_t        *rset;
 static uint32_t         rid;
 static uint32_t         reqno; 
 static resmsg_type_t    reqtyp[REQHASH_DIM];
+static int              flood;
+static int              count;
 
 int main(int argc, char **argv)
 {
@@ -257,10 +282,21 @@ static void parse_input(void)
     char     *value;
     int       i;
     resmsg_t  msg;
+    char     *e;
 
 
     if (!strncmp(str, "help", 4)) {
         str = skip_whitespaces(str + 4);
+        print_message(
+            "   acquire\n"
+            "   release\n"
+            "   update all:opt:share:shmask where all,opt,share and shmask "
+                     "are comma separated resources\n"
+            "   audio group pid prop-name:prop-value\n"
+            "   disconnect\n"
+            "   flood count\n"
+            "   stop"
+        );
     }
     else if (!strncmp(str, "acquire", 7)) {
         str = skip_whitespaces(str + 7);
@@ -355,8 +391,31 @@ static void parse_input(void)
         } while (0);
     } 
     else if (!strncmp(str, "disconnect", 10)) {
+        str = skip_whitespaces(str + 10);
         disconnect_from_manager();
     }
+    else if (!strncmp(str, "flood", 5)) {
+        str = skip_whitespaces(str + 5);
+        
+        flood = strtoul(str, &e, 10);
+
+        if (*e || flood < 1 || flood > 1000) {
+            if (*e || e == str)
+                print_message("invalid count '%s'", str);
+            else
+                print_message("invalid count %d: range is 1-1000", flood);
+            flood = count = 0;
+        }
+        else {
+            memset(&msg, 0, sizeof(resmsg_t));
+            msg.possess.type = RESMSG_ACQUIRE;
+            manager_send_message(&msg);
+        }
+    }
+    else if (!strncmp(str, "stop", 4)) {
+        str = skip_whitespaces(str + 4);
+        flood = count = 0;
+    }
     else {
         print_message("invalid input '%s'", input.buf);
         return;
@@ -556,7 +615,8 @@ static void manager_status(resset_t *rset, resmsg_t *msg)
 
 static void manager_receive_message(resmsg_t *msg, resset_t *rs, void *data)
 {
-    char  buf[80];
+    resmsg_t  req;
+    char      buf[80];
 
     (void)data;
 
@@ -572,11 +632,31 @@ static void manager_receive_message(resmsg_t *msg, resset_t *rs, void *data)
 
         case RESMSG_GRANT:
             resmsg_res_str(msg->notify.resrc, buf, sizeof(buf));
-            if (config.verbose)
-                print_message("manager granted the resources: %s", buf);
-            else 
-                print_message("granted: %s", buf);
-            print_input();
+            if (!flood) {
+                if (config.verbose)
+                    print_message("manager granted the resources: %s", buf);
+                else
+                    print_message("granted: %s", buf);
+
+                print_input();
+            }
+            else {
+                memset(&req, 0, sizeof(resmsg_t));
+                if (msg->notify.resrc == 0)
+                    req.possess.type = RESMSG_ACQUIRE;
+                else {
+                    print_message("granted %d: %s", ++count, buf);
+
+                    if (count >= flood) {
+                        flood = count = 0;
+                        print_message("flood done");
+                        break;
+                    }
+
+                    req.possess.type = RESMSG_RELEASE;
+                }
+                manager_send_message(&req);
+            }
             break;
 
         case RESMSG_ADVICE:
@@ -665,7 +745,7 @@ static void print_message(char *fmt, ...)
 
 static void usage(int exit_code)
 {
-    printf("usage: %s [-h] [-t] [-v] [-d bus-type] [-f mode-values]"
+    printf("usage: %s [-h] [-t] [-v] [-u] [-d bus-type] [-f mode-values]"
            "[-o optional-resources] [-s shared-resources -m shared-mask] "
            "class all-resources\n",
            exe_name);
@@ -673,6 +753,7 @@ static void usage(int exit_code)
     printf("\t  h\tprint this help message and exit\n");
     printf("\t  t\ttrace messages\n");
     printf("\t  v\tverbose printouts\n");
+    printf("\t  u\tallow 'unknown' (ie. other than listed below) classes");
     printf("\t  d\tbus-type. Either 'system' or 'session'\n");
     printf("\t  f\tmode values. See 'modes' below for the "
            "\n\t\tsyntax of <mode-values>\n");
@@ -684,6 +765,7 @@ static void usage(int exit_code)
            "syntax of\n\t\t<shared-mask>\n");
     printf("\tclass:\n");
     printf("\t\tcall\t  - for native or 3rd party telephony\n");
+    printf("\t\tvideoeditor\t  - for video editing/MMS\n");
     printf("\t\tcamera\t  - for photo applications\n");
     printf("\t\tringtone  - for ringtones\n");
     printf("\t\talarm\t  - for alarm clock\n");
@@ -706,10 +788,12 @@ static void usage(int exit_code)
     printf("\t\tScaleButton\n");
     printf("\t\tSnapButton\n");
     printf("\t\tLensCover\n");
+    printf("\t\tHeadsetButtons\n");
     printf("\t  no whitespace allowed in the resource list.\n");
     printf("\tmodes:\n");
-    printf("\t  comma separated lis of the following modes\n");
+    printf("\t  comma separated list of the following modes\n");
     printf("\t\tAutoRelease\n");
+    printf("\t\tAlwaysReply\n");
 
     exit(exit_code);
 }
@@ -723,19 +807,20 @@ static void parse_options(int argc, char **argv)
     config.trace = FALSE;
     config.id    = 1;
 
-    while ((option = getopt(argc, argv, "htvd:f:s:o:m:")) != -1) {
+    while ((option = getopt(argc, argv, "htvud:f:s:o:m:")) != -1) {
 
         switch (option) {
             
-        case 'h':   usage(0);                                            break;
-        case 't':   config.trace      = TRUE;                            break;
-        case 'v':   config.verbose    = TRUE;                            break;
-        case 'd':   config.bustype    = parse_bustype(optarg, 1);        break;
-        case 'f':   config.mode       = parse_mode_values(optarg, 1);    break;
-        case 'o':   config.rset.opt   = parse_resource_list(optarg, 1);  break;
-        case 's':   config.rset.share = parse_resource_list(optarg, 1);  break;
-        case 'm':   config.rset.mask  = parse_resource_list(optarg, 1);  break;
-        default:    usage(EINVAL);                                       break;
+        case 'h': usage(0);                                              break;
+        case 't': config.trace         = TRUE;                           break;
+        case 'v': config.verbose       = TRUE;                           break;
+        case 'd': config.bustype       = parse_bustype(optarg, 1);       break;
+        case 'f': config.mode          = parse_mode_values(optarg, 1);   break;
+        case 'o': config.rset.opt      = parse_resource_list(optarg, 1); break;
+        case 's': config.rset.share    = parse_resource_list(optarg, 1); break;
+        case 'm': config.rset.mask     = parse_resource_list(optarg, 1); break;
+        case 'u': config.allow_unknown = TRUE;                           break;
+        default:  usage(EINVAL);                                         break;
         
         }
     }
@@ -762,15 +847,17 @@ static void parse_options(int argc, char **argv)
 
 static char *parse_class_string(char *str)
 {
-    if (strcmp(str, "call"      ) &&
-        strcmp(str, "camera"    ) &&
-        strcmp(str, "ringtone"  ) &&
-        strcmp(str, "alarm"     ) &&
-        strcmp(str, "navigator" ) &&
-        strcmp(str, "game"      ) &&
-        strcmp(str, "player"    ) &&
-        strcmp(str, "event"     ) &&
-        strcmp(str, "background")   )
+    if (strcmp(str, "call"       ) &&
+        strcmp(str, "camera"     ) &&
+        strcmp(str, "ringtone"   ) &&
+        strcmp(str, "alarm"      ) &&
+        strcmp(str, "navigator"  ) &&
+        strcmp(str, "game"       ) &&
+        strcmp(str, "player"     ) &&
+        strcmp(str, "event"      ) &&
+        strcmp(str, "background" ) &&
+        strcmp(str, "videoeditor") &&
+        !config.allow_unknown       )
    {
        print_error("invalid class '%s'", str);
    }
@@ -793,6 +880,7 @@ static uint32_t parse_resource_list(char *rlist_str, int exit_if_error)
         { RESMSG_SCALE_BUTTON   ,  "ScaleButton"    },
         { RESMSG_SNAP_BUTTON    ,  "SnapButton"     },
         { RESMSG_LENS_COVER     ,  "LensCover"      },
+        { RESMSG_HEADSET_BUTTONS,  "HeadsetButtons" },
         {           0           ,       NULL        }
     };
 
@@ -840,6 +928,7 @@ static uint32_t parse_mode_values(char *mval_str, int exit_if_error)
 {
     static rdef_t  mdef[] = {
         { RESMSG_MODE_AUTO_RELEASE ,  "AutoRelease"  },
+        { RESMSG_MODE_ALWAYS_REPLY ,  "AlwaysReply"  },
         {             0            ,       NULL      }
     };
 
diff --git a/examples/fmradio.c b/examples/fmradio.c
index 3c0ff53..1a5515f 100644
--- a/examples/fmradio.c
+++ b/examples/fmradio.c
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #include <stdlib.h>
 #include <stdio.h>
 
diff --git a/src/dbus-msg.c b/src/dbus-msg.c
index f975354..dbb28b1 100644
--- a/src/dbus-msg.c
+++ b/src/dbus-msg.c
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/dbus-msg.h b/src/dbus-msg.h
index 5fc5983..ddeaad0 100644
--- a/src/dbus-msg.h
+++ b/src/dbus-msg.h
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #ifndef __RES_DBUS_MESSAGE_H__
 #define __RES_DBUS_MESSAGE_H__
 
diff --git a/src/dbus-proto.c b/src/dbus-proto.c
index 42283b8..26c7d9f 100644
--- a/src/dbus-proto.c
+++ b/src/dbus-proto.c
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -191,6 +213,7 @@ static int send_message(resset_t *rset,resmsg_t *rmsg,resproto_status_t status)
             }
         }
 
+        dbus_message_set_no_reply(dmsg, !need_reply);
 
         if (!need_reply)
             success = dbus_connection_send(dcon, dmsg, NULL);
@@ -226,10 +249,15 @@ static int send_error(resset_t *rset, resmsg_t *resreply, void *data)
     DBusConnection *dcon      = rcon->dbus.conn; 
     DBusMessage    *dbusmsg   = (DBusMessage *)data;
     dbus_uint32_t   serial    = dbus_message_get_serial(dbusmsg);
-    DBusMessage    *dbusreply = resmsg_dbus_reply_message(dbusmsg, resreply);
+    dbus_bool_t     noreply   = dbus_message_get_no_reply(dbusmsg);
+    DBusMessage    *dbusreply;
+
+    if (!noreply) {
+        dbusreply = resmsg_dbus_reply_message(dbusmsg, resreply);
+        dbus_connection_send(dcon, dbusreply, &serial);
+        dbus_message_unref(dbusreply);
+    }
 
-    dbus_connection_send(dcon, dbusreply, &serial);
-    dbus_message_unref(dbusreply);
     dbus_message_unref(dbusmsg);
 
     return TRUE;
diff --git a/src/dbus-proto.h b/src/dbus-proto.h
index 5d45baa..d3d0b6d 100644
--- a/src/dbus-proto.h
+++ b/src/dbus-proto.h
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #ifndef __RES_DBUS_PROTO_H__
 #define __RES_DBUS_PROTO_H__
 
diff --git a/src/internal-msg.c b/src/internal-msg.c
index cdf9c72..9f73a30 100644
--- a/src/internal-msg.c
+++ b/src/internal-msg.c
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/internal-msg.h b/src/internal-msg.h
index 120ea72..6bd4976 100644
--- a/src/internal-msg.h
+++ b/src/internal-msg.h
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #ifndef __RES_INTERNAL_MESSAGE_H__
 #define __RES_INTERNAL_MESSAGE_H__
 
diff --git a/src/internal-proto.c b/src/internal-proto.c
index 012a781..a306919 100644
--- a/src/internal-proto.c
+++ b/src/internal-proto.c
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/internal-proto.h b/src/internal-proto.h
index 5ac3506..74958c4 100644
--- a/src/internal-proto.h
+++ b/src/internal-proto.h
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #ifndef __RES_INTERNAL_H__
 #define __RES_INTERNAL_H__
 
diff --git a/src/res-conn-private.h b/src/res-conn-private.h
index 3aeacf7..294f2d3 100644
--- a/src/res-conn-private.h
+++ b/src/res-conn-private.h
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #ifndef __RES_CONN_PRIVATE_H__
 #define __RES_CONN_PRIVATE_H__
 
diff --git a/src/res-conn.c b/src/res-conn.c
index 066e11f..46efe83 100644
--- a/src/res-conn.c
+++ b/src/res-conn.c
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/res-conn.h b/src/res-conn.h
index bd8ec73..282a270 100644
--- a/src/res-conn.h
+++ b/src/res-conn.h
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #ifndef __RES_CONN_H__
 #define __RES_CONN_H__
 
diff --git a/src/res-msg.c b/src/res-msg.c
index 76a8dfb..42f1d4f 100644
--- a/src/res-msg.c
+++ b/src/res-msg.c
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -240,6 +262,7 @@ static char *flag_str(uint32_t flag)
     case RESMSG_SCALE_BUTTON:       str = "scale_button";      break;
     case RESMSG_SNAP_BUTTON:        str = "snap_button";       break;
     case RESMSG_LENS_COVER:         str = "lens_cover";        break;
+    case RESMSG_HEADSET_BUTTONS:    str = "lens_cover";        break;
     default:                        str = NULL;                break;
     }
 
diff --git a/src/res-msg.h b/src/res-msg.h
index 16e3d56..0886e22 100644
--- a/src/res-msg.h
+++ b/src/res-msg.h
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #ifndef __RES_MESSAGE_H__
 #define __RES_MESSAGE_H__
 
@@ -23,6 +45,7 @@ extern "C" {
 #define RESMSG_SCALE_BUTTON        RESOURCE_SCALE_BUTTON
 #define RESMSG_SNAP_BUTTON         RESOURCE_SNAP_BUTTON
 #define RESMSG_LENS_COVER          RESOURCE_LENS_COVER
+#define RESMSG_HEADSET_BUTTONS     RESOURCE_HEADSET_BUTTONS
 
 #define RESMSG_MODE_AUTO_RELEASE   RESOURCE_AUTO_RELEASE
 #define RESMSG_MODE_ALWAYS_REPLY   RESOURCE_ALWAYS_REPLY
diff --git a/src/res-proto.c b/src/res-proto.c
index 8d6585f..2ba1b72 100644
--- a/src/res-proto.c
+++ b/src/res-proto.c
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -53,6 +75,7 @@ EXPORT int resproto_send_message(resset_t          *rset,
 {
     resconn_t       *rcon = rset->resconn;
     resmsg_type_t    type = resmsg->type;
+    resmsg_rset_t   *flags;
     int              success;
 
     if (rset->state != RESPROTO_RSET_STATE_CONNECTED ||
@@ -61,6 +84,12 @@ EXPORT int resproto_send_message(resset_t          *rset,
     else {
         resmsg->any.id = rset->id;
         success = rcon->any.send(rset, resmsg, status);
+
+        if (success && type == RESMSG_UPDATE) {
+            flags = &resmsg->record.rset;
+            resset_update_flags(rset, flags->all, flags->opt,
+                                flags->share, flags->mask);
+        }
     }
 
     return success;
diff --git a/src/res-proto.h b/src/res-proto.h
index 806628b..c7d8987 100644
--- a/src/res-proto.h
+++ b/src/res-proto.h
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #ifndef __RES_PROTO_H__
 #define __RES_PROTO_H__
 
diff --git a/src/res-set-private.h b/src/res-set-private.h
index b5a9230..26abbd7 100644
--- a/src/res-set-private.h
+++ b/src/res-set-private.h
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #ifndef __RES_SET_PRIVATE_H__
 #define __RES_SET_PRIVATE_H__
 
@@ -9,6 +31,8 @@ resset_t *resset_create(union resconn_u*, const char*, uint32_t,
 void      resset_destroy(resset_t *);
 void      resset_ref(resset_t *);
 void      resset_unref(resset_t *);
+void      resset_update_flags(resset_t *, uint32_t, uint32_t,
+                              uint32_t,uint32_t);
 resset_t *resset_find(union resconn_u *, const char *, uint32_t);
 
 #endif /* __RES_SET_PRIVATE_H__ */
diff --git a/src/res-set.c b/src/res-set.c
index f89e184..bec5ae8 100644
--- a/src/res-set.c
+++ b/src/res-set.c
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #include <stdlib.h>
 #include <string.h>
 
@@ -76,6 +98,21 @@ void resset_unref(resset_t *rset)
     }
 }
 
+void resset_update_flags(resset_t *rset,
+                         uint32_t  all,
+                         uint32_t  opt,
+                         uint32_t  share,
+                         uint32_t  mask)
+{
+    if (rset != NULL) {
+        rset->flags.all   = all;
+        rset->flags.opt   = opt;
+        rset->flags.share = share;
+        rset->flags.mask  = mask;
+    }
+}
+
+
 resset_t *resset_find(resconn_t *rcon, const char *peer, uint32_t id)
 {
     resset_t *rset;
diff --git a/src/res-set.h b/src/res-set.h
index deda3a2..3662da9 100644
--- a/src/res-set.h
+++ b/src/res-set.h
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #ifndef __RES_SET_H__
 #define __RES_SET_H__
 
diff --git a/src/res-types.h b/src/res-types.h
index ebcd9c8..2e1ce5e 100644
--- a/src/res-types.h
+++ b/src/res-types.h
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #ifndef __RES_TYPES_H__
 #define __RES_TYPES_H__
 
@@ -20,6 +42,7 @@ typedef enum {
     resource_scale_button    = 10,
     resource_snap_button     = 11,
     resource_lens_cover      = 12,
+    resource_headset_buttons = 13,
 } resource_type_t;
 
 
@@ -35,6 +58,7 @@ typedef enum {
 #define RESOURCE_SCALE_BUTTON     RESOURCE_BIT( resource_scale_button )
 #define RESOURCE_SNAP_BUTTON      RESOURCE_BIT( resource_snap_button )
 #define RESOURCE_LENS_COVER       RESOURCE_BIT( resource_lens_cover )
+#define RESOURCE_HEADSET_BUTTONS  RESOURCE_BIT( resource_headset_buttons )
 
 typedef enum {
   resource_auto_release = 0,
diff --git a/src/resource-glib-glue.c b/src/resource-glib-glue.c
index b1ca72d..133b3af 100644
--- a/src/resource-glib-glue.c
+++ b/src/resource-glib-glue.c
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
diff --git a/src/resource-glue.h b/src/resource-glue.h
index 4e668c2..d2eaaad 100644
--- a/src/resource-glue.h
+++ b/src/resource-glue.h
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #ifndef __LIB_RESOURCE_GLUE_H__
 #define __LIB_RESOURCE_GLUE_H__
 
diff --git a/src/resource.c b/src/resource.c
index bce37f9..c82c05a 100644
--- a/src/resource.c
+++ b/src/resource.c
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -87,6 +109,8 @@ struct resource_set_s {
 static resource_set_t *rslist;
 static uint32_t        rsid;
 static uint32_t        reqno;
+static DBusConnection *rsdbus;
+
 
 static DBusConnection *get_dbus(void);
 static resconn_t      *get_manager(DBusConnection *);
@@ -122,6 +146,25 @@ static void            destroy_request(request_t *);
 static void            resource_log(const char *, ...);
 
 
+EXPORT int resource_set_use_dbus(DBusConnection *conn)
+{
+    if (rslist != NULL) {
+        resource_log("refusing D-Bus connection change, has resource sets");
+        return FALSE;
+    }
+    
+    if (rsdbus != NULL) {
+        dbus_connection_unref(rsdbus);
+        rsdbus = NULL;
+    }
+    
+    if (conn != NULL)
+        rsdbus = conn;
+
+    return TRUE;
+}
+
+
 EXPORT resource_set_t *resource_set_create(const char          *klass,
                                            uint32_t             mandatory,
                                            uint32_t             optional,
@@ -181,6 +224,7 @@ EXPORT int resource_set_configure_advice_callback(resource_set_t      *rs,
     if (rs != NULL) {
         rs->advicecb.function = advcb;
         rs->advicecb.data = advdata;
+        return TRUE;
     }
     return TRUE;
 }
@@ -294,15 +338,22 @@ static DBusConnection *get_dbus(void)
     DBusError err;
 
     if (dbus == NULL) {
+        if (rsdbus != NULL) {
+            dbus = rsdbus;
+            return dbus;
+        }
+        
         dbus_error_init(&err);
 
-        dbus = resource_get_dbus_bus(DBUS_BUS_SESSION, &err);
+        dbus = resource_get_dbus_bus(DBUS_BUS_SYSTEM, &err);
 
         if (dbus_error_is_set(&err)) {
             /* TODO: some more distinctive errno setting would not harm :) */
             errno = EIO;
             dbus_error_free(&err);
         }
+        else
+            rsdbus = dbus;
     }
 
     return dbus;
diff --git a/src/resource.h b/src/resource.h
index 4c1395f..d0c006b 100644
--- a/src/resource.h
+++ b/src/resource.h
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #ifndef __LIB_RESOURCE_H__
 #define __LIB_RESOURCE_H__
 
@@ -5,6 +27,7 @@
 #include <sys/types.h>
 #include <res-types.h>
 
+#include <dbus/dbus.h>
 
 #ifdef	__cplusplus
 extern "C" {
@@ -17,11 +40,14 @@ typedef void (*resource_callback_t)(resource_set_t *resource_set,
                                     uint32_t        resources,
                                     void           *userdata);
 
+
 typedef void (*error_callback_function_t)(resource_set_t *resource_set,
                                           uint32_t        errcod,
                                           const char     *errmsg,
                                           void           *userdata);
 
+int resource_set_use_dbus(DBusConnection *conn);
+
 resource_set_t *resource_set_create(const char          *klass,
                                     uint32_t             mandatory,
                                     uint32_t             optional,
diff --git a/src/visibility.h b/src/visibility.h
index 060d02a..ca38104 100644
--- a/src/visibility.h
+++ b/src/visibility.h
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #ifndef __RES_VISIBILITY_H__
 #define __RES_VISIBILITY_H__
 
diff --git a/tests/resource-test.c b/tests/resource-test.c
index 60b2e3a..93ab6aa 100644
--- a/tests/resource-test.c
+++ b/tests/resource-test.c
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #include <dbus/dbus.h>
 #include <check.h>
 #include <stdlib.h>
@@ -362,7 +384,11 @@ int resproto_send_message(resset_t          *rset,
 
 DBusConnection *resource_get_dbus_bus(DBusBusType type, DBusError *err)
 {
+#ifdef APPROXIMATE_DBUS_WITH_C0FFEE
 	return (DBusConnection *) 0xC0FFEE;
+#else
+	return dbus_bus_get(type, err);
+#endif
 }
 
 resproto_handler_t handlers[3];